Merge branch 'android-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Wed, 20 Oct 2010 21:35:05 +0000 (14:35 -0700)
committerColin Cross <ccross@android.com>
Wed, 20 Oct 2010 21:35:05 +0000 (14:35 -0700)

Trivial merge