Merge branch 'android-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Sat, 18 Dec 2010 01:23:38 +0000 (17:23 -0800)
committerColin Cross <ccross@android.com>
Sat, 18 Dec 2010 01:23:38 +0000 (17:23 -0800)

Trivial merge