Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorColin Cross <ccross@android.com>
Sun, 27 Feb 2011 01:19:39 +0000 (17:19 -0800)
committerColin Cross <ccross@android.com>
Sun, 27 Feb 2011 01:19:39 +0000 (17:19 -0800)

Trivial merge