commit | 9f35752f7f0046c6bbf5ee28f4d5e399ddd38585 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 07 11:18:19 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 07 11:18:19 2010 -0700 |
tree | 4eed46b5b6bcde2a0ea62595c9da16ba73384a45 | |
parent | e89d2f7af4f1e888080dbf00b90ccd50f201121e [diff] | |
parent | 6150d112854f18a07884596ba43ea576ba2e8361 [diff] |
am 6150d112: merge from open-source master