commit | 830b5c7e2b9b01bbf6e6e2a4c97dbb84114c0e63 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed May 05 16:13:49 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 05 16:13:49 2010 -0700 |
tree | 95f571bce595bd01cee3160711fcbb447afa3fc5 | |
parent | b457889b75c897fa6fbda1dd9e23b8ee1ce3b6ad [diff] | |
parent | ad3f4a4561385af969e3e7ff280b59d842c6eb0b [diff] |
am 579e08e6: am f7896449: merge from open-source master