tree 1ef49b5214cadb3c7c8207b26d077eddf139d21a
parent 935b1301d9a1bac5614b97642fb07cf2e6b07f51
parent 3eca31ebcacf8939617c6a604c0421790e7fe0a5
author Xin Li <delphij@google.com> 1695978271 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1695978271 +0000

[automerger skipped] Merge UP1A.231005.007 am: 8b43078bb9 -s ours am: 2ef4e321a2 -s ours am: 3eca31ebca -s ours

am skip reason: Merged-In I02c6f67e9f820e6b895f7bdc9bc483ca43e267d7 with SHA-1 2ba9a8b670 is already in history

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

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