| commit | 36331f8455822539fe4fbb0a25fbc377bbc80a89 | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Mon Jul 11 20:20:12 2011 +0200 |
| committer | David 'Digit' Turner <digit@google.com> | Mon Jul 11 20:48:41 2011 +0200 |
| tree | 967e499e9ada45ab6245cf7b84b9275648a96627 | |
| parent | eb0a62cb26d7bed289df823e2d68e422c39b5659 [diff] | |
| parent | 09636e177160821ba018297e8127b4e6109e7b6a [diff] |
resolved conflicts for merge of 09636e17 to gingerbread-plus-aosp Change-Id: If2b21def45b5de222e560af442a0ff9f56da5a35