commit | ddbd8325f53a29200d512e018d0a456cb0942ead | [log] [tgz] |
---|---|---|
author | Eric Biggers <ebiggers@google.com> | Mon Oct 29 17:19:39 2018 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Oct 29 17:19:39 2018 +0000 |
tree | 5dd2abe8b4b139cc049661b27fa00d8abf594c2b | |
parent | 0016efbc446910650cc041194621cc8f9ba04151 [diff] | |
parent | ba997ee583d926aafb08bdc97d1e5a352eb51481 [diff] |
Merge changes from topic "e4crypt_to_fscrypt" * changes: vold: get the fscrypt kernel API declarations from linux/fs.h vold: rename from "ext4 encryption" to fscrypt