OSDN Git Service

[automerger skipped] Merge "Introduce ro.crypto.uses_fs_ioc_add_encryption_key proper...
authorTreehugger Robot <treehugger-gerrit@google.com>
Tue, 21 Apr 2020 16:20:32 +0000 (16:20 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Tue, 21 Apr 2020 16:20:32 +0000 (16:20 +0000)
commitbcbddda15aec4579ca3f9e7fc1eb2546f9103a90
tree97f65d77cebc06363b9debb37c7beaeb31f1467c
parentc1dce0695b26e0985c505a1228e7ac9de4ad8d03
parentebcd59d19b1a89293e5bfe10bce3b41fedcdab65
[automerger skipped] Merge "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property" am: 83c78a2bb1 am: ebcd59d19b -s ours

am skip reason: Change-Id I562df49deffdccdb2cfd657130fc05b24d40a6a6 with SHA-1 78f806198f is in history

Change-Id: Ib183a53d8b49427ddf243d22db5df1f4b2b9815e