Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Mon, 2 May 2011 19:29:23 +0000 (12:29 -0700)
committerRebecca Schultz Zavin <rebecca@android.com>
Mon, 2 May 2011 19:29:23 +0000 (12:29 -0700)
commit734779ea0f1af6eb7ac747d8780a361afa956e4c
tree673e6d65e1ce93784689361c5b6fb72f47d8f24e
parent6553d6b02a6ef7d3de4cbf10d9e7059a03f380de
parent4beca48ac9132fdaf09fc08f6954459238dd9c16
Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36