OSDN Git Service

Merge "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property" am: 83c78a2bb1
authorTreehugger Robot <treehugger-gerrit@google.com>
Tue, 21 Apr 2020 16:07:15 +0000 (16:07 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Tue, 21 Apr 2020 16:07:15 +0000 (16:07 +0000)
Change-Id: Icfcf0222bd97d52d6fed2eeef3c3fca335d8b93e


Trivial merge