| commit | f91bed8b6616d14bbc94fd63abcf6709d541ee39 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:23:27 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:23:27 2010 -0800 |
| tree | 7f288bf92ba8a1e6f0845331633d8b625f6c33be | |
| parent | 68f673de564d7b1f628faeca12a9b8f4233a819f [diff] | |
| parent | ee67ee7420a4a3f95229f8e53780e81589540993 [diff] |
am ee67ee74: reconcile main tree with open-source eclair Merge commit 'ee67ee7420a4a3f95229f8e53780e81589540993' into eclair-plus-aosp * commit 'ee67ee7420a4a3f95229f8e53780e81589540993': android-2.1_r1 snapshot