OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 25 Aug 2010 19:04:48 +0000 (12:04 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 25 Aug 2010 19:04:48 +0000 (12:04 -0700)
commit21020da3806d5dab7813fe9ef9962a3034bff5df
tree771d1c441df0d39d27dfa42e79076c49f481f7ff
parent8e5376cdace10ff57557573f7b35a790ea123821
parent237de4d51e302fb164b576d713c83e9293fb2313
merge from open-source master

Change-Id: I2221a668ad1a63280148588b21fe9f2b64ce013f