| commit | f8681b3b66dea66f282f9baa65ebbf6693e2b57e | [log] [tgz] |
|---|---|---|
| author | repo sync <enh@google.com> | Sun May 02 16:15:28 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun May 02 16:15:28 2010 -0700 |
| tree | bb93a38c6e1f452bc10add518d0c4e6968b088e7 | |
| parent | ef80529bf84b94c7eef3fc132707041a83bfff01 [diff] | |
| parent | 605c303c522a69ddd1f465a3b70fcaa48d456b70 [diff] |
am 605c303c: am 32e2163c: am 385ee637: resolved conflicts for merge of f3565212 to froyo-plus-aosp