Merge branch 'android-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Thu, 20 Jan 2011 05:21:20 +0000 (21:21 -0800)
committerColin Cross <ccross@android.com>
Thu, 20 Jan 2011 05:21:20 +0000 (21:21 -0800)

Trivial merge