| commit | 48ffea93dff6b952b4ad5818b748dadd2dd7c19e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:43:08 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:43:08 2010 -0800 |
| tree | c42229a7ae0f2fa7981f8a2fcedff9bbc0272e9f | |
| parent | c58e38c35a109442a1f8997f5dcc12aa3067a6fc [diff] | |
| parent | cf69b0c725088e68d9da916d909cf063562c5ee7 [diff] |
am cf69b0c7: reconcile main tree with open-source eclair Merge commit 'cf69b0c725088e68d9da916d909cf063562c5ee7' into eclair-plus-aosp * commit 'cf69b0c725088e68d9da916d909cf063562c5ee7': android-2.1_r1 snapshot