tree b5487cdf0a40a61d0edd6a92f500cc815f578f6c
parent 173daa911f5f74743e8e32d60b54cddfe6e7c52e
parent 6c4cddc799118259d09e3a0209d10c54985688b7
author Xin Li <delphij@google.com> 1693946078 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1693946078 +0000

[automerger skipped] Merge UP1A.230905.019 am: 3e9a7f5242 -s ours am: 6c4cddc799 -s ours

am skip reason: Merged-In Iff37b366a8c54c913b36115319ed0c4e025b2a70 with SHA-1 1bfdea9aa9 is already in history

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

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