tree ae7d522d75da74f5c34dc60a69eebbefc2339bca
parent c4fe833ad7347f32a6da4a7593974985ca042130
parent 29e6b8138bf1a863b7f78d3a6b7a2eef5e3643c1
author Treehugger Robot <treehugger-gerrit@google.com> 1589924436 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1589924436 +0000

Merge "db845c: Add fw_devlink=permissive to the boot arguments" am: 7e64ea31a5 am: 29e6b8138b

Change-Id: Id19598c48d05433c92e26c63e5a6379153df2e97