Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Tue, 7 Dec 2010 20:05:41 +0000 (12:05 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Tue, 7 Dec 2010 20:05:41 +0000 (12:05 -0800)

Trivial merge