Merge branch 'android-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Fri, 7 Jan 2011 02:12:22 +0000 (18:12 -0800)
committerColin Cross <ccross@android.com>
Fri, 7 Jan 2011 02:12:22 +0000 (18:12 -0800)

Trivial merge