tree 1f1e87bfc0c30446376a36a354c3416c47a5352f
parent f48a9c271ac311b9158631562d9625bfe03659e0
parent c624480e5ad497ef74683256ecee72e7b3c12de2
author Xin Li <delphij@google.com> 1639517039 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1639517039 +0000

[automerger skipped] Merge Android 12 QPR1 am: decfcc5c95 -s ours am: c624480e5a -s ours

am skip reason: Merged-In I3d5b68befe702ce9c13ebb01e6015a6c5b008a2f with SHA-1 9dbf1cf35a is already in history

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

Change-Id: I563e962d918dcb672f954c5f820721b6cdcb8361