Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorColin Cross <ccross@android.com>
Thu, 25 Nov 2010 00:41:53 +0000 (16:41 -0800)
committerColin Cross <ccross@android.com>
Thu, 25 Nov 2010 00:41:53 +0000 (16:41 -0800)

Trivial merge