Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Thu, 24 Feb 2011 19:47:42 +0000 (11:47 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Thu, 24 Feb 2011 19:47:42 +0000 (11:47 -0800)

Trivial merge