Merge branch 'android-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Sat, 22 Jan 2011 03:10:44 +0000 (19:10 -0800)
committerColin Cross <ccross@android.com>
Sat, 22 Jan 2011 03:10:44 +0000 (19:10 -0800)

Trivial merge