diff options
author | Xin Li <delphij@google.com> | 2023-10-06 09:05:09 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-06 09:05:09 +0000 |
commit | d6f638e3d58537fb6c5c789ac7ad99e82d12d5e7 (patch) | |
tree | 22eaf8d8542862f35e044690ac617c1662081396 | |
parent | b47aa7524e62717c1c354c7a43a863fbd1180c2f (diff) | |
parent | cad87045be297769ec34309154ac5384e3abb4db (diff) | |
download | protobuf-d6f638e3d58537fb6c5c789ac7ad99e82d12d5e7.tar.gz |
[automerger skipped] Merge "Merge Android 14" into main am: 3d95aae759 -s ours am: cad87045be -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: I2ac363c44c52b879d9dad92d3e9012609ebaa7da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions