| commit | f6e474fa09819f915010bd81504cd31ea5afae6a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:45:20 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:45:20 2010 -0800 |
| tree | 3671a0659776fb4f9427cf54dcbf5a467e964bc9 | |
| parent | b5db45a6364753c801bc03f94613259c312b6aa6 [diff] | |
| parent | 5cc978566314b54a6964185faeca94c747b48f2f [diff] |
am 5cc97856: reconcile main tree with open-source eclair Merge commit '5cc978566314b54a6964185faeca94c747b48f2f' into eclair-plus-aosp * commit '5cc978566314b54a6964185faeca94c747b48f2f': android-2.1_r1 snapshot