| commit | 9e2be6f4eeaefbd4393c2e128a517efdb1fe0741 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:09:25 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:09:25 2010 -0800 |
| tree | a0b5575e01c2a6a71f5736c1b9cd057210ed3b01 | |
| parent | 3a6cabb470d322077d1d884b157408615f29d96e [diff] | |
| parent | 48ab24c9e802b8a958a21e7a7733198a7cf2e72e [diff] |
am 48ab24c9: am d7e672ad: reconcile main tree with open-source eclair Merge commit '48ab24c9e802b8a958a21e7a7733198a7cf2e72e' * commit '48ab24c9e802b8a958a21e7a7733198a7cf2e72e': android-2.1_r1 snapshot