commit | 3598d4baa6aae97ef3a4f42dc6e04e3346e4d0ca | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu May 13 09:54:44 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 13 09:54:44 2010 -0700 |
tree | a13d48546e925a991a65ce55ecbe7cecdb4d8ad2 | |
parent | 2e5cfa831a9be1f43bfec6c3f0bd0b85724abc39 [diff] | |
parent | 2793fb6384a16116c78b0d557c7ad24d2d243094 [diff] |
am 485b800e: am 1a3b3d48: merge from open-source master