tree b9fa351036d2085c82e1dd29638e55f33f592e87
parent a5d7ccf379c7f12ca9bc57705579a53e3dac2425
parent 504f7446059a89feb6dce510f32a6e4da5075605
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"