tree 0013f4d5a1786000375ddcb2a915ebd46c31e3f9
parent d9469225e14f8b8a86705f5cb54c434cbba66055
parent fc4dcbd61b1f6f8ab5fd7da5c636f836805e18fd
author Bill Yi <byi@google.com> 1641577730 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1641577730 +0000

[automerger skipped] Merge sc-qpr1 to aosp-master - DO NOT MERGE am: fc4dcbd61b -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7150dabe5a4d343ca802ff0322b27be08b5a6b48