| commit | 6cee17f7e2248d8dcd9a4e9e2b2323a2510ab572 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:23:14 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:23:14 2010 -0800 |
| tree | e0a94999e0491bab162fe31b372f6d0b011a4d79 | |
| parent | e22e90a5947d797c8fa120baedf8cd1bbd69bdf8 [diff] | |
| parent | d065bffc91877d1ca464a24c204e2bfee6ddabb2 [diff] |
am d065bffc: reconcile main tree with open-source eclair Merge commit 'd065bffc91877d1ca464a24c204e2bfee6ddabb2' into eclair-plus-aosp * commit 'd065bffc91877d1ca464a24c204e2bfee6ddabb2': android-2.1_r1 snapshot