Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Tue, 15 Mar 2011 23:51:19 +0000 (16:51 -0700)
committerRebecca Schultz Zavin <rebecca@android.com>
Tue, 15 Mar 2011 23:51:19 +0000 (16:51 -0700)

Trivial merge