OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 14 Sep 2010 01:02:15 +0000 (18:02 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 14 Sep 2010 01:02:15 +0000 (18:02 -0700)
commit21200d8144af6c7324ade317a1593d811e930a38
treecb088456b121f842715dd1e1b8dd90acdd979a4e
parentcf729a8b5f1c06def6771f4aaf187eb0f12a1852
parentb337e03d003c48a3ac98fe89233bc0d7c26317de
merge from open-source master

Change-Id: I9da203c9724e3fa8026dcb1ca4c8d0e365b5caad