tree ae7d522d75da74f5c34dc60a69eebbefc2339bca
parent 411b901327348be6f71fd8b5c39d2dc12db3d264
parent e8e6019288002860fdae9f4d297a96a9167fa806
author Treehugger Robot <treehugger-gerrit@google.com> 1589925093 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1589925093 +0000

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

Change-Id: I6a7071bfa99ccb93bfed4a2818f07807f8beec3b