tree 23d96d9ac20b1d5182a557ff6d4dbb43d3ffe12f
parent 388f687a29a49d4ee55321e49b2e5d4f704f7410
parent 5612006f315d114139c02ba157cb5698cbbbc4ed
author Tianjie Xu <xunchang@google.com> 1532642120 -0700
committer android-build-merger <android-build-merger@google.com> 1532642120 -0700

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

Change-Id: I48ffce296309d61eba7cc5710a8537d708ff68f3