OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 1 Mar 2010 17:30:21 +0000 (09:30 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 1 Mar 2010 17:30:21 +0000 (09:30 -0800)
commit05d73503297f1a739e61389eb637725d13477f41
treef4d901d22f470e7d421cde73033da6a191f7db17
parenteb45079beef2cdce2a6054875896937b3eaa5aa4
parentb206c77531b7554b880292c88d895b5afb8dbfb7
merge from open-source master