Merge branch 'android-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Wed, 13 Oct 2010 01:44:55 +0000 (18:44 -0700)
committerColin Cross <ccross@android.com>
Wed, 13 Oct 2010 01:44:55 +0000 (18:44 -0700)

Trivial merge