Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Fri, 22 Apr 2011 00:37:21 +0000 (17:37 -0700)
committerRebecca Schultz Zavin <rebecca@android.com>
Fri, 22 Apr 2011 00:37:21 +0000 (17:37 -0700)

Trivial merge