OSDN Git Service

Merge "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property" into rvc-dev...
authorNikita Ioffe <ioffe@google.com>
Tue, 21 Apr 2020 15:38:49 +0000 (15:38 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Tue, 21 Apr 2020 15:38:49 +0000 (15:38 +0000)
Change-Id: I26f6df5af9af7a980b598ff7021e0bdf3e391ac3


Trivial merge