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

Trivial merge