| commit | a15081c3af2c6ecd5540cedc2e3c2868f4a6b897 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:22:36 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:22:36 2010 -0800 |
| tree | 1cb8abc888170f4864a238bb260034859950fd01 | |
| parent | 3e4f2ed52da10057cee97af16c9f1731e4e7b3d6 [diff] | |
| parent | c5718a3d3d1786d57998315641361809d8f03e79 [diff] |
am c5718a3d: reconcile main tree with open-source eclair Merge commit 'c5718a3d3d1786d57998315641361809d8f03e79' into eclair-plus-aosp * commit 'c5718a3d3d1786d57998315641361809d8f03e79': android-2.1_r1 snapshot