tree 1255a2bc42ab7e2d33f2bdd574cae399d425bdbd
parent 48cf37090966a9ad50371f82c4577914aeea3fe1
parent b7b5e2eea49ca2ed32785a0f3ab139591a1e7394
author Xin Li <delphij@google.com> 1646737422 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646737422 +0000

[automerger skipped] Merge Android 12L am: f8da3416f3 -s ours am: b7b5e2eea4 -s ours

am skip reason: Merged-In I311810b8a547a9cf4f6616419553dcc317c9a39d with SHA-1 35c8babcd3 is already in history

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

Change-Id: I4ebf28bd3432158c7adad924d77c51949513ff85