Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Thu, 13 Jan 2011 01:46:58 +0000 (17:46 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Thu, 13 Jan 2011 01:46:58 +0000 (17:46 -0800)

Trivial merge