| commit | 6ddbd1563d84a7b18607aa67c1f5f5e4095f816f | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Fri Sep 23 10:27:34 2011 +0200 |
| committer | David 'Digit' Turner <digit@google.com> | Fri Sep 23 10:27:34 2011 +0200 |
| tree | e5d56fd36583812ea287475a12ff6542776ca06e | |
| parent | dda2e51a15ddfc44b34ec3c35e68f3bc1cfb5786 [diff] | |
| parent | 4e6af749d5996edd6558821a7e400427f0457306 [diff] |
resolved conflicts for merge of 4e6af749 to gingerbread-plus-aosp Change-Id: I3a8d71bd9b359a067c2a250db99e855e59c08854