tree a210563cb8b2f99ca6d090be5d94d05757c559a3
parent 5c938a49f53709f55662b04235fbe0283303c4ed
parent 632e33706442741c468b4dee9302b62d181692ee
author Hsin-Yi Chen <hsinyichen@google.com> 1518079616 +0000
committer android-build-merger <android-build-merger@google.com> 1518079616 +0000

Merge "Add metadata to config_gen" am: 71e6a6cbe8
am: 632e337064

Change-Id: Iaa1d054982a339eddbe81b74d509d08855377dad