Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Wed, 15 Jun 2011 19:09:43 +0000 (12:09 -0700)
committerRebecca Schultz Zavin <rebecca@android.com>
Wed, 15 Jun 2011 19:09:43 +0000 (12:09 -0700)

Trivial merge