OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 Sep 2010 03:25:17 +0000 (20:25 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 Sep 2010 03:25:17 +0000 (20:25 -0700)
commit533ad11d3103ba47c5441caa01e2f52a3eb21fbd
tree932963c2601497cc76a9b1d9a17daae32f98fcbc
parenta4043100451810fc6da88f652078ce6c21507780
parente3125f9b2ca9d71d47dc6fa101f2529c82ab2227
merge from open-source master

Change-Id: I1961157a504a5e8116c8c6a98f0b591922e534cf