| commit | 0291b0cada30c1c8eaaa346577969ff9b4eb5195 | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Mon Jul 26 12:18:37 2010 -0700 |
| committer | David 'Digit' Turner <digit@google.com> | Mon Jul 26 12:18:37 2010 -0700 |
| tree | b1545ee6fa3184dc1524a5f9e1fe9d460765f1b3 | |
| parent | 6d4d8cb79c5578d33ab17806d67b1e53a730fbc3 [diff] | |
| parent | 6774809b6249d9d4efd982b6e3ca377c84482d9a [diff] |
resolved conflicts for merge of 6774809b to gingerbread-plus-aosp Change-Id: I633c3067c874c215da0c6ede00af41d8e3587d8b