aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2023-10-06 08:59:28 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-06 08:59:28 +0000
commitb47aa7524e62717c1c354c7a43a863fbd1180c2f (patch)
tree22eaf8d8542862f35e044690ac617c1662081396
parent800c932073a85a5e6bddfd75fdb1fc136ad6720d (diff)
parent8fbbbffada1778a51ddd021ee2ed1e0ff8dafde1 (diff)
downloadprotobuf-b47aa7524e62717c1c354c7a43a863fbd1180c2f.tar.gz
[automerger skipped] Merge Android 14 am: 9faa32bae9 -s ours am: 8fbbbffada -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: I05d30b6f608781f7023df41d61c92638b7729ee2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions