tree 1255a2bc42ab7e2d33f2bdd574cae399d425bdbd
parent 31d6bdd15b7fd34e363312f3496bf8faaf26f068
parent d4a47a6549401839515cbc9f2ebc736a5c7af6b1
author Bill Yi <byi@google.com> 1649442679 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1649442679 +0000

[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: d4a47a6549 -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/+/2059230

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