Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Sat, 29 Jan 2011 05:58:22 +0000 (21:58 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Sat, 29 Jan 2011 05:58:22 +0000 (21:58 -0800)

Trivial merge