| commit | 0b38f2d59add9b1a64f4cf405239b15cc7102d2d | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:10:04 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:10:04 2010 -0800 |
| tree | 450ce35cebd24fc39f8a5b2a9676b0f93c90469a | |
| parent | 3d97a06be8d204ed5df2c5609e1990bc038d9408 [diff] | |
| parent | 39f130fb905302abb9c4b7fd28029d0014582574 [diff] |
am 39f130fb: reconcile main tree with open-source eclair Merge commit '39f130fb905302abb9c4b7fd28029d0014582574' * commit '39f130fb905302abb9c4b7fd28029d0014582574': android-2.1_r1 snapshot