Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Mon, 24 Jan 2011 23:50:14 +0000 (15:50 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Mon, 24 Jan 2011 23:50:14 +0000 (15:50 -0800)

Trivial merge