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