| commit | 196be3b6348f4a6c975d25dbee135fc3952e0ac7 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:45:00 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:45:00 2010 -0800 |
| tree | 4641fc54bdceeb45c2313b2f0a19a2ae7f11e2cf | |
| parent | d2cb8a75dc6d7393d84cac6b3cad08260b9e2e6f [diff] | |
| parent | 8411d87eefef7af413367b52def3d63250142ff4 [diff] |
am 8411d87e: reconcile main tree with open-source eclair Merge commit '8411d87eefef7af413367b52def3d63250142ff4' into eclair-plus-aosp * commit '8411d87eefef7af413367b52def3d63250142ff4': android-2.1_r1 snapshot