| commit | cbee971a105adcf071b89838818f31b37388e9b9 | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Fri Nov 21 17:07:17 2014 -0800 |
| committer | John Reck <jreck@google.com> | Fri Nov 21 17:07:17 2014 -0800 |
| tree | f2e832010053da355aa7f5a6bf68ac0e8e7937d3 | |
| parent | 161b51ba065fb54c3b983db61eb3dc48a0e0a855 [diff] | |
| parent | 08372601ab6b644e6d477c1377a482241075c08a [diff] |
resolved conflicts for merge of 08372601 to lmp-mr1-dev-plus-aosp Change-Id: I86b78ada4f30c23ae1232ac5a509986d5b8dc546