Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Mon, 21 Mar 2011 21:15:10 +0000 (14:15 -0700)
committerRebecca Schultz Zavin <rebecca@android.com>
Mon, 21 Mar 2011 21:15:10 +0000 (14:15 -0700)

Trivial merge