tree a7e4720ec3534d7901461e1a929e5c1875f5c252
parent 13284098c2003e77fd77608cc79bf944cf333505
parent 9ebe7f2b5d395b23126ca384999399cb2a5f41e5
author Xin Li <delphij@google.com> 1702335707 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1702335707 +0000

[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 24f721d310 -s ours am: b2205e2973 -s ours am: 9ebe7f2b5d -s ours

am skip reason: Merged-In I3ee8bebc95bb060adf2e2ca16f5d5402cc9a04ce with SHA-1 1a5c1a0ee0 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/logging/+/2863582

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