Merge branch 'android-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Sat, 8 Jan 2011 01:16:59 +0000 (17:16 -0800)
committerColin Cross <ccross@android.com>
Sat, 8 Jan 2011 01:16:59 +0000 (17:16 -0800)

Trivial merge