commit | 070438c8d64d53e6169084fa1d4a9efea85a078a | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed May 19 08:23:46 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 19 08:23:46 2010 -0700 |
tree | 6993687d0c39d4fe3303d40166c0ad7450e9e969 | |
parent | 8923143818dd5de89c284f954df906f4bf75972c [diff] | |
parent | 4ee7e49544fed00637da78e11b2a6aa8603ffded [diff] |
am 0b6defef: am aa2fe148: merge from open-source master