| commit | 000ee1d751497b67fc48975368a1975019d0ac25 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:11:33 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:11:33 2010 -0800 |
| tree | 3da3d0c16866eed943c51c33f3a73b80582d8014 | |
| parent | 6d09dd7a0d4248e9280ac132e7e3e70797c95a7e [diff] | |
| parent | 02797369a90d032b6860f91ad3add2f810efd66f [diff] |
am 02797369: am 4c97c59e: reconcile main tree with open-source eclair Merge commit '02797369a90d032b6860f91ad3add2f810efd66f' * commit '02797369a90d032b6860f91ad3add2f810efd66f': android-2.1_r1 snapshot