tree d028286549ae56a799bd969c9e8fe14de406ee8d
parent 6be63ea89dfee63dc8a835df458bfd8d48e02de6
parent 33d8530233c1ade4af29294c81f23560f20f35c5
author Xin Li <delphij@google.com> 1693341493 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1693341493 +0000

[automerger skipped] Merge Android U (ab/10368041) am: ebb5268f24 -s ours am: a80621052c -s ours am: 7d2235da70 -s ours am: 33d8530233 -s ours

am skip reason: Merged-In Ic3cd0b08fb0046a82ad78cf1748f657e12fd8ef1 with SHA-1 7ac550dcb6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/24181622

Change-Id: I15aeaf8026234cd43525391795f0471dc97c3f14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>