tree 104271c2396aee9675ceb30cc9f86e4e5c1806b1
parent f2bbcccbc4347cd8e4c33b805c409b2f2505bc5c
parent 78032398ba3a44963d013be164ac1e8b8956b9ec
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1693603964 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1693603964 +0000

Merge "Add a sentinel Android.bp in external/protobuf/java" into main am: 58a2accc85 am: 5393f84e45 am: 78032398ba

Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2734254

Change-Id: I759386e480f7523c8bfa87ba1bbd61f1ba130808
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>