commit | a543a508dc77b60f43d658184d56a0be5b47af36 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon May 17 14:52:46 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 17 14:52:46 2010 -0700 |
tree | a8ff93c42fb45597ef036e11858677c9666692e2 | |
parent | e8cde6f9ba713a7f579fee226c9a41753d48b332 [diff] | |
parent | 0b4c28498d00012c161d4af8943fad4e3ff8aca5 [diff] |
am 453894d8: am 8382068e: merge from open-source master