| commit | 431ccc3e7f8540da36a8d07128a0c976918436b9 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:17:48 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:17:48 2010 -0800 |
| tree | 04cbf6a39e8fefaa1fca927332fc04322366e2f8 | |
| parent | 4529c93faf3d21913393a477f67864006afdc75f [diff] | |
| parent | fa2de09c65fc50379eaffb22e71fb4b0474a3e22 [diff] |
am fa2de09c: am 8e2734af: reconcile main tree with open-source eclair Merge commit 'fa2de09c65fc50379eaffb22e71fb4b0474a3e22' * commit 'fa2de09c65fc50379eaffb22e71fb4b0474a3e22': android-2.1_r1 snapshot