Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Tue, 15 Feb 2011 00:11:42 +0000 (16:11 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Tue, 15 Feb 2011 00:11:42 +0000 (16:11 -0800)

Trivial merge