| commit | 43c4f436742a8f74440eed53c87bbd6796df753d | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Jul 24 20:02:31 2015 -0700 |
| committer | Elliott Hughes <enh@google.com> | Fri Jul 24 20:02:31 2015 -0700 |
| tree | 1491a533b5c6592858ddb8ba6432b39d75e8ec56 | |
| parent | 8282b80180d926d5569d826ff762c680e16ff76c [diff] | |
| parent | f9c65dea726cacea7845d95afc4a9b1d3708f9b2 [diff] |
resolved conflicts for merge of 038b76c2 to mnc-dev-plus-aosp Change-Id: Id84946b67f207a7586cfa9c918ee6e4ae335fe86