tree 6111632b66758b8042f4b1b273668190d15c5896
parent ae0eeb02091efc02f4ec25afffed485e694b63ab
parent b1a78de8091ca0b296c34feafc773c9980cf73bc
author Xin Li <delphij@google.com> 1702332152 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1702332152 +0000

[automerger skipped] Merge Android 14 QPR1 am: 9cf8bbef71 -s ours am: b1a78de809 -s ours

am skip reason: Merged-In I87c8910b8b45ea75b3455defd0024ff68c2cdd0b with SHA-1 0fea872397 is already in history

Original change: https://android-review.googlesource.com/c/device/google/barbet/+/2863159

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