Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Tue, 21 Dec 2010 19:51:19 +0000 (11:51 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Tue, 21 Dec 2010 19:51:19 +0000 (11:51 -0800)

Trivial merge