Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Wed, 26 Jan 2011 01:59:12 +0000 (17:59 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Wed, 26 Jan 2011 01:59:21 +0000 (17:59 -0800)
Change-Id: I003a21d788d6cdcb6594b1328b13a1913c5a552f


Trivial merge