| commit | 0e2df22b763fb8d73fcdbc9c417bb8ba1205f042 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:18:41 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:18:41 2010 -0800 |
| tree | 5a196250a7b7793e6e7190bdfc659b49f596c7da | |
| parent | cf6df894fa8fbda563a8bf836f47b0f12d663c84 [diff] | |
| parent | 2836cc573a12cbe12e7d2fce7468c1a83374e510 [diff] |
am 2836cc57: reconcile main tree with open-source eclair Merge commit '2836cc573a12cbe12e7d2fce7468c1a83374e510' * commit '2836cc573a12cbe12e7d2fce7468c1a83374e510': android-2.1_r1 snapshot