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:34:03 +0000 (16:34 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Tue, 21 Apr 2020 16:34:03 +0000 (16:34 +0000)
commit8fbc7edbcb0662d63dc6ba3a119229119d5f3ab2
tree97f65d77cebc06363b9debb37c7beaeb31f1467c
parent279349d468b6bd5fa3072dde1b6e2bed656cfa48
parentbcbddda15aec4579ca3f9e7fc1eb2546f9103a90
[automerger skipped] Merge "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property" am: 83c78a2bb1 am: ebcd59d19b -s ours am: bcbddda15a -s ours

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

Change-Id: I8cdb012f5976e3c964e16dff9da9541831442734