| commit | 7e1a27370842bed8940765d9f3143b3be153ef14 | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Fri May 26 09:47:18 2017 +0100 |
| committer | Nicolas Geoffray <ngeoffray@google.com> | Fri May 26 11:03:19 2017 +0100 |
| tree | 6555a2ee5372be6ac5c64b817694490cac37313c | |
| parent | 3bb97f1b9bf6b85346ab15f51be92622d73da544 [diff] | |
| parent | 255b69aca02f2344474d51b1cb3d2c63a25bdc86 [diff] |
resolve merge conflicts of 255b69aca02f to oc-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I9caf7542f11b0b322da063a5a08140384eba0ce0