Merge branch 'android-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Tue, 2 Nov 2010 23:21:00 +0000 (16:21 -0700)
committerColin Cross <ccross@android.com>
Tue, 2 Nov 2010 23:21:00 +0000 (16:21 -0700)

Trivial merge