Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Fri, 3 Jun 2011 20:00:24 +0000 (13:00 -0700)
committerRebecca Schultz Zavin <rebecca@android.com>
Fri, 3 Jun 2011 20:00:24 +0000 (13:00 -0700)

Trivial merge