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