tree 684ad8bfe8fab95fd0f8747f31d334963c4e661a
parent 11681ac0497d7171e6b3842177fb8798e0838f46
parent e22d1ba5b6e7c6d9813c4cde9eef15e035c0a3cc
author Xin Li <delphij@google.com> 1702023679 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1702023679 +0000

[automerger skipped] Merge UQ1A.231205.015 am: e22d1ba5b6 -s ours

am skip reason: Merged-In I403e87cf5943f5c45d6d0db99a3e15018064067a with SHA-1 8f9b6dbaaa is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25591208

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