| commit | be014da6387246edd786a4ec9ca049d3accdcd12 | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Thu Apr 27 13:56:20 2017 +0100 |
| committer | Nicolas Geoffray <ngeoffray@google.com> | Thu Apr 27 13:56:20 2017 +0100 |
| tree | b5190cbd2336b45a35d671f9ae8c2c6c20b9438f | |
| parent | 1691ec9729243c97bb0548e2264bc998f6e00021 [diff] | |
| parent | 01f050f21fb2d4223c0df32f92fb7e61aee54891 [diff] |
resolve merge conflicts of 01f050f21fb2 to oc-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: If3796f456fa80c2f9c649855d39f4dab01e54f3c