diff options
author | Xin Li <delphij@google.com> | 2023-10-06 11:06:38 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-06 11:06:38 +0000 |
commit | d378ab27c30a44c66e045df7e824cd39b9cf8856 (patch) | |
tree | 22eaf8d8542862f35e044690ac617c1662081396 | |
parent | de06ddd477f6cb2cd9427b7b255cf5ca682e099c (diff) | |
parent | db79457a3e8edf0e2351636b98a538d9142bcb0a (diff) | |
download | protobuf-d378ab27c30a44c66e045df7e824cd39b9cf8856.tar.gz |
[automerger skipped] Merge "Merge Android 14" into main am: 3d95aae759 -s ours am: cad87045be -s ours am: d6f638e3d5 -s ours am: db79457a3e -s ours
am skip reason: Merged-In I713b8fbfa8498c6ed5c8791c88549269bc325eba with SHA-1 87050d55e3 is already in history
Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2777028
Change-Id: Idab1f34228de90004c0f77fbccbe7a9fbac54260
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions