Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Thu, 18 Nov 2010 23:48:39 +0000 (15:48 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Thu, 18 Nov 2010 23:48:39 +0000 (15:48 -0800)

Trivial merge