tree b3d021e6a4d8b57c16c2aa912d63d31f1b2aff87
parent ab4f1c77c537f50f5b61e4dcea5d89ea6dc9258a
parent 462f20ca5dad28b293e512805da84ae4182fdbbb
author Xin Li <delphij@google.com> 1591631810 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591631810 +0000

[automerger skipped] Merge QQ3A.200605.002 into master am: 462f20ca5d -s ours

am skip reason: Change-Id I05d52262ef02cfe3146cbf685acc1fe448676204 with SHA-1 ab4f1c77c5 is in history

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

Change-Id: Ic7310887ca8cb856de2dee1b3a8317142e404b68