OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 7 Jun 2010 23:32:53 +0000 (16:32 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 7 Jun 2010 23:32:53 +0000 (16:32 -0700)
commite475488b1159a7cb7d8829f16818d4b6b5a368c1
tree2e6c7cfa32c293f7fd4aa65eb772567fe6465e65
parent076c8394fa028d61192dbcdeb3efed9db6cd8e25
parentec39747a769180da9be4e71b597fb538bcc9b800
merge from open-source master

Change-Id: I56de40bad4be52a06300bfc310e16d27b2fb14df