commit | 63cac27739a3000b0778ff63accc58a0cc72548d | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon May 10 11:13:00 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 10 11:13:00 2010 -0700 |
tree | 5bf9222cffbf575634b71e30c9f8e8687931e04d | |
parent | 68ed2f54ba2e7e204fdd7c908f465c5d6ddc66cf [diff] | |
parent | f48c3ac39d0f63b8cf16b92d3543b888715b13de [diff] |
am f48c3ac3: am f7c63421: merge from open-source master