Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Sat, 29 Jan 2011 06:00:33 +0000 (22:00 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Sat, 29 Jan 2011 06:00:33 +0000 (22:00 -0800)

Trivial merge