Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Thu, 18 Nov 2010 23:48:39 +0000 (15:48 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Thu, 18 Nov 2010 23:48:39 +0000 (15:48 -0800)
commitb9dfed5d61eaa9f5f69bec9160b8bd1fdc53d147
tree366d6c964f66252746413329772b522173bc065c
parent3f396ff1233b0bb54ae492e89293e2204ffa0936
parent7e17882ff36d62c066bf47af6299bb2cffea21ed
Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36