| commit | 280dd0135a308847cc881dbf3feb5b1145158206 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:22:19 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:22:19 2010 -0800 |
| tree | 6c463580fbac9017f7e5e48829f8fbee20c15446 | |
| parent | 0803d6ecdca360fb71fa761b03870c9f7239a8f5 [diff] | |
| parent | 5c26a1c0d38916c686329817a3d07a3d22f9ee10 [diff] |
am 5c26a1c0: reconcile main tree with open-source eclair Merge commit '5c26a1c0d38916c686329817a3d07a3d22f9ee10' into eclair-plus-aosp * commit '5c26a1c0d38916c686329817a3d07a3d22f9ee10': android-2.1_r1 snapshot