Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Tue, 7 Dec 2010 20:01:42 +0000 (12:01 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Tue, 7 Dec 2010 20:01:42 +0000 (12:01 -0800)

Trivial merge