Merge branch 'android-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Mon, 22 Nov 2010 21:23:31 +0000 (13:23 -0800)
committerColin Cross <ccross@android.com>
Mon, 22 Nov 2010 21:23:31 +0000 (13:23 -0800)

Trivial merge