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