tree 9ff7c79f5da0673ea305193e05691a200069af4e
parent e9220762b0fa2154671eb04841546cb081b31bf6
parent b952451d9d3207b6d3602bca3b30337dba212a1b
author Treehugger Robot <treehugger-gerrit@google.com> 1552535490 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1552535490 +0000

Merge "Move controller_properties.json to the vendor image"