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

Trivial merge