Merge branch 'android-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Thu, 12 May 2011 21:08:42 +0000 (14:08 -0700)
committerColin Cross <ccross@android.com>
Thu, 12 May 2011 21:08:42 +0000 (14:08 -0700)

Trivial merge