| commit | 1b66faf09bc898083b00fb45a316f2f8ed945249 | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Thu Oct 30 11:30:02 2014 +0100 |
| committer | David 'Digit' Turner <digit@google.com> | Thu Oct 30 11:30:02 2014 +0100 |
| tree | 8b86136ef505a0434af03cd7fba90b0dd117cbfa | |
| parent | 87bc4e4b14d2cff1e05de8a0c905891b48e9694d [diff] | |
| parent | 3372af9afa4a2a7e9d050eb27f39132ef0fbd156 [diff] |
resolved conflicts for merge of 7472654e to stage-aosp-master Change-Id: Ieda2d8d1ac00854de28959e4632827a12b399cf2