commit | 9a069c80fe6195c4e3d813712881b902da25cd5a | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed May 12 12:46:17 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 12 12:46:17 2010 -0700 |
tree | b42abf928fc8a10b25e319651348ae0ae2ecf41a | |
parent | 1b7e3ef417f236c333c7528e7af5485fc4da664b [diff] | |
parent | 63ece47fecdb5932de9af5cfec4cf998764e6e0a [diff] |
am 63ece47f: am 2a9ae01f: merge from open-source master