OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 2 Jun 2010 14:22:11 +0000 (07:22 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 2 Jun 2010 14:22:11 +0000 (07:22 -0700)
commit8cc5a8166dcdccfdb7f379a05190cef43f91c423
tree6ab5409fc5f50e86aec646f54718469d286b9efc
parent59b6dce0d5035b44dd8d99523efc63a469246f42
parentd2e12d042860e092a827128859df0519b03a4816
merge from open-source master

Change-Id: I900ca65f70c1a66781fb5f6f37c45961416d5650