commit | 7e282b8784ad05327a43dd9b20d71d884594537b | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:20:51 2010 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:20:51 2010 -0800 |
tree | cfbac5189d983a7c7d05539fc972a86738d4ebe1 | |
parent | 4966b56f4baab759050da7222e1645b394c16e90 [diff] | |
parent | f647b76060c4dc2a90777edeff326a26f75a4212 [diff] |
am f647b760: am 9215898d: reconcile main tree with open-source eclair Merge commit 'f647b76060c4dc2a90777edeff326a26f75a4212' * commit 'f647b76060c4dc2a90777edeff326a26f75a4212': android-2.1_r1 snapshot