Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Wed, 1 Jun 2011 17:55:55 +0000 (10:55 -0700)
committerRebecca Schultz Zavin <rebecca@android.com>
Wed, 1 Jun 2011 17:55:55 +0000 (10:55 -0700)

Trivial merge