commit | cbaf2265e1c9fa8a26e326648e353089a206cd51 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed May 19 09:24:37 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 19 09:24:37 2010 -0700 |
tree | 6993687d0c39d4fe3303d40166c0ad7450e9e969 | |
parent | c53dfb80b02965e6bee04e55eb5049b05cabf986 [diff] | |
parent | 29c733110af19dfb6bae0349cde3fb3a9c3cbeaf [diff] |
am bea97a89: am 2dc7c6c4: merge from open-source master