diff options
author | Xin Li <delphij@google.com> | 2023-10-07 00:26:09 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-07 00:26:09 +0000 |
commit | 859c233dc2f5c14f4c533e2dc2c3126c3c5dc634 (patch) | |
tree | 5388c84fc92ea7306ba96e0d7b2f2dca46ad2f00 | |
parent | fc0656214c595483b96af023aec26a473810ae36 (diff) | |
parent | d378ab27c30a44c66e045df7e824cd39b9cf8856 (diff) | |
download | protobuf-859c233dc2f5c14f4c533e2dc2c3126c3c5dc634.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: d378ab27c3 -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: I39e13cd73bc29224f413c277c623280d19e9f3b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions