| commit | 003eefd3dc011a04a29f12c505726b63144650f7 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:14:33 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:14:33 2010 -0800 |
| tree | a86a90777fca1a35441edc82a66e962487e6cc75 | |
| parent | 14801bf7f1702e3cfe08c1867126a904af032f7c [diff] | |
| parent | 5d911d775a8467c383583edfbda280c122137ead [diff] |
am 5d911d77: am a37baf0a: reconcile main tree with open-source eclair Merge commit '5d911d775a8467c383583edfbda280c122137ead' * commit '5d911d775a8467c383583edfbda280c122137ead': android-2.1_r1 snapshot