Merge branch 'android-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Tue, 11 Jan 2011 01:18:52 +0000 (17:18 -0800)
committerColin Cross <ccross@android.com>
Tue, 11 Jan 2011 01:18:52 +0000 (17:18 -0800)

Trivial merge