Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Mon, 14 Feb 2011 23:32:54 +0000 (15:32 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Mon, 14 Feb 2011 23:32:54 +0000 (15:32 -0800)

Trivial merge