commit | 9890d1a2a82f0d4b12b4d79b04aa61fe50bbdb04 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:10:23 2010 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:10:23 2010 -0800 |
tree | 7e144bac66c0547b4ee1ceb75cfce337c761c025 | |
parent | 39d48d33d2ba1ff2a68661facb0a39b79ba36253 [diff] | |
parent | 0e114ab7024033e2afda010d977be01db4d7a934 [diff] |
am eaf951c5: am 75753107: reconcile main tree with open-source eclair Merge commit 'eaf951c59631829c84ac71b413cf7b2ff186be17' * commit 'eaf951c59631829c84ac71b413cf7b2ff186be17': android-2.1_r1 snapshot