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)
commit852af15d6955402087821b2947f3a542ac836dda
treed8b1407499cd214e3e1e3e399870d4b949817790
parentb5cefc25cd04804027724059344840f98e851781
parent60463e0ed16e0af62120db55b4c2f4c8b64acf64
Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36