commit | 89ffe5e56e2c54d7675a468c05e6c6751a5cc8d8 | [log] [tgz] |
---|---|---|
author | Nicolas Geoffray <ngeoffray@google.com> | Thu Jun 15 15:25:27 2017 +0100 |
committer | Nicolas Geoffray <ngeoffray@google.com> | Thu Jun 15 15:26:13 2017 +0100 |
tree | dd37efefa50bddfdc1c66b084937a3742daf89d0 | |
parent | d7c5ec09ec09b1df3432fa5c7cff11f630c630df [diff] | |
parent | ff34af445dc45cdc348ee0fa3f16f7edc055a00e [diff] |
resolve merge conflicts of ff34af445 to oc-dr1-dev Test: I solemnly swear I tested this conflict resolution. Change-Id: I5f3dce08bad394f4057f79b521d0732ff197267e