| commit | c5908853dfd8ea68e81a17e4d57b1fdf76349373 | [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 | 997d01fb0d145e9795629c7c35ef224acd032f6e | |
| parent | fe22c50410029eaf37f3e8e910a8c5fdd5769c70 [diff] | |
| parent | 1fb2a6cd4c27847f8de8369b497f37d3d47c622f [diff] |
am 1fb2a6cd: reconcile main tree with open-source eclair Merge commit '1fb2a6cd4c27847f8de8369b497f37d3d47c622f' into eclair-plus-aosp * commit '1fb2a6cd4c27847f8de8369b497f37d3d47c622f': android-2.1_r1 snapshot