[automerger skipped] Merge "DO NOT MERGE ANYWHERE Require protobuf for build flags" into main am: ec11bca5c3
-s ours am: 94ba65dc93
-s ours
am skip reason: contains skip directive Original change: https://android-review.googlesource.com/c/platform/build/+/3107022 Change-Id: I8ed164f77eba176b110a6fa2cd6053ecda321101 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
b4b7d6389e