Merge branch 'android-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Fri, 8 Oct 2010 00:35:27 +0000 (17:35 -0700)
committerColin Cross <ccross@android.com>
Fri, 8 Oct 2010 00:35:27 +0000 (17:35 -0700)

Trivial merge