tree dcd4cbe05a30c766d1a1aec4653b650b4610e84f
parent bbef1d22ed9732a031368d8a9c55bc68fe3971ee
parent 5d5bcb829ac5b5dd7bf11733ce48acc27567dca6
author Colin Cross <ccross@android.com> 1586370570 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1586370570 +0000

Merge "Revert^2 "Fix static dependency on libprotobuf-cpp-lite-ndk""