| commit | 736557c5105c2bc338917ff4b3b668bceeb86c0d | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Mon Oct 07 19:09:43 2019 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Oct 07 19:09:43 2019 +0000 |
| tree | b911a386d7dfd48a6c9a027f728a7b905adbbfb8 | |
| parent | d0accefc0529873ea5d1724330ad995b26f372c0 [diff] | |
| parent | eaadc9d4266c2c20274d9d4f4a8ad55c48e155f5 [diff] |
Merge changes from topic "fscrypt-key-mgmt-improvements" * changes: init/fscrypt_init_extensions: support setting v2 encryption policies fs_mgr_fstab: support specifying encryption policy version in fstab