tree 0185bbcd84908a3510e5d49af5bad888e2906c76
parent 43fc740af22e700bcb4b2ebfd4bdaedc859fb3f4
parent f024d9a5f74824c4d367ab663662ca86d883e208
author Xin Li <delphij@google.com> 1702332157 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1702332157 +0000

[automerger skipped] Merge Android 14 QPR1 am: 05af8e87d5 -s ours am: f024d9a5f7 -s ours

am skip reason: Merged-In I9bc3dd31ae367782d96a5bf05d0da58dab99dded with SHA-1 b0c91586d6 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/libcups/+/2866290

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