| commit | b0818e8871eb157ee6a6991ea27a6082dc084741 | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Fri May 05 10:23:19 2017 +0100 |
| committer | Nicolas Geoffray <ngeoffray@google.com> | Fri May 05 10:23:19 2017 +0100 |
| tree | f42e7db99e0aa9696377e7ee1786b6d0b1697cd2 | |
| parent | 596fc8b8d4c3dbb2d0e806969e23ac614c47af36 [diff] | |
| parent | c2421a2a3c37adc2140ff524fed42fb6e32a66f5 [diff] |
resolve merge conflicts of c2421a2a3c37 to oc-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I5825e002c7ac5655703cd31d84ccc1cb5379f0e0