| commit | 4b15cc528c0de1933d04fddef0dc61535e08a10f | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:09:18 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:09:18 2010 -0800 |
| tree | ed2db0fd21ec4961b5e11ad4fa69f9693d22973b | |
| parent | 8806a907a3078865e08a021501863285758c4385 [diff] | |
| parent | 952e01354e12e96a11795d72c452a89a4c233d23 [diff] |
am 952e0135: am 63e547ef: reconcile main tree with open-source eclair Merge commit '952e01354e12e96a11795d72c452a89a4c233d23' * commit '952e01354e12e96a11795d72c452a89a4c233d23': android-2.1_r1 snapshot