OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 9 Mar 2010 00:43:28 +0000 (16:43 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 9 Mar 2010 00:43:28 +0000 (16:43 -0800)
commit9bd138da2ddc1a673e1ac3f9f3560f348974124e
treef4d901d22f470e7d421cde73033da6a191f7db17
parent05d73503297f1a739e61389eb637725d13477f41
parentb206c77531b7554b880292c88d895b5afb8dbfb7
merge from open-source master

Change-Id: Ib18c1121d51bd176e0de1666cad19ef10261825a