tree f9b1146e106ff11b9abf166aa5dd12655531aba4
parent 42b762a147ed65dd1554c2805aed53baf523bc6c
parent 6cb5ca28f11e2472265b67d5938a4e99bd0031c6
author Treehugger Robot <treehugger-gerrit@google.com> 1588107137 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1588107137 +0000

Merge "hikey960: enable File-Based Encryption" am: 6cb5ca28f1

Change-Id: I2fe7feb186403cc3572bbd62f77ae0f4c4edce21