Merge branch 'android-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Thu, 2 Dec 2010 02:27:19 +0000 (18:27 -0800)
committerColin Cross <ccross@android.com>
Thu, 2 Dec 2010 02:27:19 +0000 (18:27 -0800)

Trivial merge