| commit | 9bc50b04a1ed1040c9085903db630fcf9594384b | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:45:31 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:45:31 2010 -0800 |
| tree | 77665dde4fe29ab05a4194971dcee9ee94449a77 | |
| parent | f3b777a9ef0f028636e00859ffe9530d6c1babfb [diff] | |
| parent | fe8fdab585e44396cf3f95c2aa78b649f3686312 [diff] |
am 1fb2a6cd: reconcile main tree with open-source eclair Merge commit '1fb2a6cd4c27847f8de8369b497f37d3d47c622f' into eclair-plus-aosp * commit '1fb2a6cd4c27847f8de8369b497f37d3d47c622f': android-2.1_r1 snapshot