tree 23d96d9ac20b1d5182a557ff6d4dbb43d3ffe12f
parent f2e7b1757aa7a3b56c560f721b229de99baa7a2e
parent f3480024c2ea36daacb3b3bb00107f71a45955b3
author Tianjie Xu <xunchang@google.com> 1532635935 -0700
committer android-build-merger <android-build-merger@google.com> 1532635935 -0700

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

Change-Id: Id695d0d49b75c4f0a828bef01bedc36281e15939