tree a81f77eb405d77360eabea539d7e04d427349ea7
parent 0343caa274002715d28f0b4761c52163e6a1a3ba
parent f6aa9a2d6e9ec5697a69ea9fc1961e2e1ffc0af5
author Xin Li <delphij@google.com> 1702335463 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1702335463 +0000

[automerger skipped] Merge Android 14 QPR1 am: b454fe7937 -s ours am: 5cc368b0e1 -s ours am: f6aa9a2d6e -s ours

am skip reason: Merged-In If9d9e69ac0255ffb503b9e2a067f7be81ed6c139 with SHA-1 fe93969af2 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/2863577

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