Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Wed, 17 Nov 2010 21:20:43 +0000 (13:20 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Wed, 17 Nov 2010 21:20:43 +0000 (13:20 -0800)

Trivial merge