commit | fcd394e51c9e6bff1e7238a4e8cf25cc5eb355a2 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:20:38 2010 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:20:38 2010 -0800 |
tree | 1a93cb8c4ea4ecaf8f9c5f7969ff6238f88291f8 | |
parent | 24458abbcace20bb97541d2cf838dfb15487d940 [diff] | |
parent | 28656d8707fa4e953f3934088792e2ee1158ce03 [diff] |
am 28656d87: am a63efa5c: reconcile main tree with open-source eclair Merge commit '28656d8707fa4e953f3934088792e2ee1158ce03' * commit '28656d8707fa4e953f3934088792e2ee1158ce03': android-2.1_r1 snapshot