| commit | 9f78ffb27e8f6a9de6a9db1d04887cf1eedfff81 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:48:16 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:48:16 2010 -0800 |
| tree | ff165b2bb0d03f31602365a5c5646e81f44e05e1 | |
| parent | 8e79fda826f78afe063763183d31398cdee5ac84 [diff] | |
| parent | 615f84460214276708732c8f43ba4e04df30a14d [diff] |
am 615f8446: reconcile main tree with open-source eclair Merge commit '615f84460214276708732c8f43ba4e04df30a14d' into eclair-plus-aosp * commit '615f84460214276708732c8f43ba4e04df30a14d': android-2.1_r1 snapshot