tree c61ef496c25d838f4231dfbbe73ebc81683b684a
parent 66962c0c2c7d3cc41f8d6a18d305874c864cc36c
parent c26e56ffbed22acce9c2cc14ed164bf4f66f9c4a
author Xin Li <delphij@google.com> 1648955496 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1648955496 +0000

[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 4727b4ab1f -s ours am: 0e90566304 -s ours am: c26e56ffbe -s ours

am skip reason: Merged-In I65fd881a3776cc03a95a62670f3843103b8d0a24 with SHA-1 f06909aba3 is already in history

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

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