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 22:30:35 +0000 (14:30 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Thu, 3 Mar 2011 22:30:35 +0000 (14:30 -0800)

Trivial merge