tree 23d96d9ac20b1d5182a557ff6d4dbb43d3ffe12f
parent 0686aa454e02625655c4b710f75e0c0b8fd169ee
parent 2a047b9ff379dd8859cad960c2cf2a3d88ae67e0
author Tianjie Xu <xunchang@google.com> 1532636806 -0700
committer android-build-merger <android-build-merger@google.com> 1532636806 -0700

Merge "Add proto3 support for care_map" am: 8d9b3aec3d am: f3480024c2
am: 2a047b9ff3

Change-Id: Ie437e57634525c36087f5255934d02c49b42c37c