tree 97f65d77cebc06363b9debb37c7beaeb31f1467c
parent 9c306323e2655f3810137cab8a93f4c31b4a8a5a
parent 4e1e7ef09a33d368ec41b76fd82fefd6f876aa6c
author Nikita Ioffe <ioffe@google.com> 1587480288 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1587480288 +0000

Merge "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property" into rvc-dev am: 4e1e7ef09a

Change-Id: I6c88e5725a1e8ed3300bfeda5bed26b0c8875e72