commit | 3c22473b9f4eafd8de8ba81dec9805e53101022c | [log] [tgz] |
---|---|---|
author | Yifan Hong <elsk@google.com> | Mon Oct 23 17:27:10 2017 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Oct 23 17:27:10 2017 +0000 |
tree | f2cf244231e56422ef13c3a4f79b8b0d7784fc39 | |
parent | a67b209b1c2678304d3c5eb8deb8d0bda9d74902 [diff] | |
parent | eb14e3013ea11b3d47d40fa860f16345c607fef6 [diff] |
Merge "assemble_vintf conflict of hal names for multiple manifest fragments"