| commit | da846fcf1b6a7bbd2f9f30c965b25f084568ef75 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:22:49 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:22:49 2010 -0800 |
| tree | 211ce66dd971d75f0b20a26b3571898330933815 | |
| parent | 4e9332cb0bb84df4c08bbb469e59a54eab2a9df0 [diff] | |
| parent | 4c382b13657be5d949e7dfc9ef46a66f2eb496e0 [diff] |
am 4c382b13: reconcile main tree with open-source eclair Merge commit '4c382b13657be5d949e7dfc9ef46a66f2eb496e0' into eclair-plus-aosp * commit '4c382b13657be5d949e7dfc9ef46a66f2eb496e0': android-2.1_r1 snapshot