| commit | 9175ac3b242057d306b04a6f2f37fedace748b9b | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Fri May 05 11:36:27 2017 +0100 |
| committer | Nicolas Geoffray <ngeoffray@google.com> | Fri May 05 11:36:27 2017 +0100 |
| tree | a4180824a9c36aed160d8d4a6c01146268af6d8b | |
| parent | f628d8f286ba9c000528a6f07e4edb2e167654f8 [diff] | |
| parent | 7827bcc3efe137fbe0d62da8a845f91c059b18ba [diff] |
resolve merge conflicts of 7827bcc3e to oc-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: Ib00772a1460f0d066366edec8df35831f1039ac3