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)
commitf48009c2b34be347f5e9ecac11b75a848cc82b4d
tree6e8ca75054424be170afb776ddfb7cedb8159875
parent283182462d2a1ea8b29fc2e74d9525aec6143f2e
parentffac9011e9ff630d7c43bce7956ccf534e03b71e
Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36