commit | 702b01c21194ca8cf01572dd4b6eecb4d3e3af46 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Apr 21 09:24:08 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 21 09:24:08 2010 -0700 |
tree | ef59c149c579d2e39313c09ed1ffd059bb554133 | |
parent | 424dff854c84b1c3f07ee6e04b811a0f6ac9c715 [diff] | |
parent | 5ef5272be985dfdeafa86077c306f6b64d334240 [diff] |
am 5ef5272b: merge from open-source master