tree 196902916e46b71c43f40acae5087e86c4b7c534
parent a80621052c760e6da6a43584074a1367d455a2ba
parent a5f9850e1299b6e8c841af6e90f30dd69074c73c
author Xin Li <delphij@google.com> 1696582762 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696582762 +0000

[automerger skipped] Merge Android 14 am: 6eec4e3ce3 -s ours am: a5f9850e12 -s ours

am skip reason: Merged-In I758613c62a7117292908db5e4879b62b1186bb8e with SHA-1 67a182987e is already in history

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

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