OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Sep 2010 20:20:53 +0000 (13:20 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Sep 2010 20:20:53 +0000 (13:20 -0700)
commit1f6505c143b900793fc80696f44fa7a9a775796e
treeb0aa72ec4081ef7c9b71eba4a9e4306961f350a9
parentb207dd25ac60926a7660f56d526becc3f09f5d9e
parenta07933b1eef5f32c73747123aa2f05246f1d4c07
merge from open-source master

Change-Id: I0eb4eb60c095693a26e76cc3051d77df2aefccb1