tree 1255a2bc42ab7e2d33f2bdd574cae399d425bdbd
parent 7e0b95fc9aa1c74d057433a96d934dc730e346e7
parent 5d868cbc7376be2564dd22819bba5e8ca8da3333
author Xin Li <delphij@google.com> 1651697813 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1651697813 +0000

[automerger skipped] Merge SP2A.220505.002 am: 5d868cbc73 -s ours

am skip reason: Merged-In Ia5ff62e79443b233dfcc6d2d5e405b25cde73503 with SHA-1 31d6bdd15b is already in history

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

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