commit | da5e159cc38bf239524302d634473f6ef2a6614d | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:14:37 2010 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:14:37 2010 -0800 |
tree | b1f8ee310e96826560740ca6590291a283c54b51 | |
parent | 5d3c8c8400881fb91764fa3c1cfb28afd41a57a7 [diff] | |
parent | 4b4babc89eee20d614ccbb5217b1544626959614 [diff] |
am 4b4babc8: am dbbd8aed: reconcile main tree with open-source eclair Merge commit '4b4babc89eee20d614ccbb5217b1544626959614' * commit '4b4babc89eee20d614ccbb5217b1544626959614': android-2.1_r1 snapshot