tree 936aee0aca3566f52cf02f2f02238d977b28fe3a
parent 3c2b399820226a7d640d35a7206add9733fa6ae5
parent a47f985edd536cf1c39d3580e7fabc38ebefdaf4
author Tianjie Xu <xunchang@google.com> 1534483253 -0700
committer android-build-merger <android-build-merger@google.com> 1534483253 -0700

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

Change-Id: I7aae377ba333d7e163eda743a02c3bb04002877a