Merge branch 'android-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Thu, 9 Dec 2010 03:54:28 +0000 (19:54 -0800)
committerColin Cross <ccross@android.com>
Thu, 9 Dec 2010 03:54:28 +0000 (19:54 -0800)

Trivial merge