tree 936aee0aca3566f52cf02f2f02238d977b28fe3a
parent 6ebca741fb7f2346a9a55a49a40bb66e37d54bcf
parent 0901a08fc22b4ef3c07372614d5bdba8961bec1b
author Tianjie Xu <xunchang@google.com> 1534477070 -0700
committer android-build-merger <android-build-merger@google.com> 1534477070 -0700

Merge "Add a python binary to generate the protobuf for care_map" am: fae0881528
am: 0901a08fc2

Change-Id: I4e8671c015abbc6699b2903187630784d30639ad