OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 2 Jun 2010 14:23:24 +0000 (07:23 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 2 Jun 2010 14:23:24 +0000 (07:23 -0700)
commit740c3e2e97a4cca24ecb534de72663ced238156a
tree94ed7b4e28009365960c7f6258f1d385604d1d05
parent8cc5a8166dcdccfdb7f379a05190cef43f91c423
parent4b5c09f29e37c8d07dcba57e4c4da13089a9d63d
merge from open-source master

Change-Id: I02c592cc054ac16e494ca7a34673ffb562287b01