Merge branch 'android-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Thu, 4 Nov 2010 19:18:08 +0000 (12:18 -0700)
committerColin Cross <ccross@android.com>
Thu, 4 Nov 2010 19:18:08 +0000 (12:18 -0700)

Trivial merge