| commit | 1dcb0f01031cd03f792f36d3e9aa871cc9e81db9 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:13:14 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:13:14 2010 -0800 |
| tree | e427f3516c7be7a207765fc8eae5300034b1b871 | |
| parent | f46b2ae9ceec0509c04de55c4a0ffe545d50350c [diff] | |
| parent | 658670c53a32eb1843efde585933da2e9cb5864e [diff] |
am 658670c5: reconcile main tree with open-source eclair Merge commit '658670c53a32eb1843efde585933da2e9cb5864e' * commit '658670c53a32eb1843efde585933da2e9cb5864e': android-2.1_r1 snapshot