| commit | 97814ab2a3355ca94122e692660b61796d5ab7af | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Tue Jul 12 01:38:41 2011 +0200 |
| committer | David 'Digit' Turner <digit@google.com> | Tue Jul 12 01:38:41 2011 +0200 |
| tree | a2ae3f44fdb0e35012858171057a9a6e6224a296 | |
| parent | 202729a0c1d966345dcbfa21db7d886b5d1e6200 [diff] | |
| parent | 8f1f5b061f12fd0b155c70b46796f1605e8bf292 [diff] |
resolved conflicts for merge of 8f1f5b06 to gingerbread-plus-aosp Change-Id: Ie5d26c5a8b31e85aa5137ddbc5eef3616df4fcba