Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Tue, 16 Nov 2010 22:34:28 +0000 (14:34 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Tue, 16 Nov 2010 22:34:34 +0000 (14:34 -0800)
Change-Id: Ie3ee3a63df7ba098c3480a2f4f5c669a74909688


Trivial merge