Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Wed, 16 Feb 2011 17:56:33 +0000 (09:56 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Wed, 16 Feb 2011 17:56:33 +0000 (09:56 -0800)

Trivial merge