tree 3ff7648f8271f4d7ba6181f9eedf2977b1e21b99
parent 65f2333062176aba53d88cfa6be10f4e58d9cc4f
parent 70ef3c1c9dedc11c86203e8666226dd5976279eb
author Colin Cross <ccross@android.com> 1568757827 -0700
committer android-build-merger <android-build-merger@google.com> 1568757827 -0700

Merge "Remove protobuf vendorcompat from base_vendor.mk"
am: 70ef3c1c9d

Change-Id: Iac8a423aa7b7fc2acecca0a651050d5f7ef67b15