Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Thu, 13 Jan 2011 01:51:34 +0000 (17:51 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Thu, 13 Jan 2011 01:51:34 +0000 (17:51 -0800)

Trivial merge