Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Tue, 8 Mar 2011 20:26:45 +0000 (12:26 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Tue, 8 Mar 2011 20:26:45 +0000 (12:26 -0800)

Trivial merge