| commit | 74202ea993f28c685166d4b6c07359bcc7823873 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:08:44 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:08:44 2010 -0800 |
| tree | 568e82009b7d4e9f69435e8b1503ebdd8d5cb7c3 | |
| parent | 8a5d1a1868ab1b1466df2f8d6549fae8110192bf [diff] | |
| parent | 546b62cd4c1255bdb681c416d5c9b2ad22ff5e2e [diff] |
am 546b62cd: am d57f7d5f: reconcile main tree with open-source eclair Merge commit '546b62cd4c1255bdb681c416d5c9b2ad22ff5e2e' * commit '546b62cd4c1255bdb681c416d5c9b2ad22ff5e2e': android-2.1_r1 snapshot