Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Sat, 4 Dec 2010 00:00:06 +0000 (16:00 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Sat, 4 Dec 2010 00:00:06 +0000 (16:00 -0800)

Trivial merge