Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Fri, 17 Dec 2010 23:32:37 +0000 (15:32 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Fri, 17 Dec 2010 23:32:37 +0000 (15:32 -0800)

Trivial merge