tree 936aee0aca3566f52cf02f2f02238d977b28fe3a
parent d03842982f58d1bb865ca71435965ff9bb00d186
parent fae088152838c3e562d06dac951d4d79b027d51b
author Tianjie Xu <xunchang@google.com> 1534467125 -0700
committer android-build-merger <android-build-merger@google.com> 1534467125 -0700

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

Change-Id: I259dcf3ba7d3840436d96640e91a00cf9be0fdf3