Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Sat, 19 Feb 2011 01:23:59 +0000 (17:23 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Sat, 19 Feb 2011 01:23:59 +0000 (17:23 -0800)

Trivial merge