tree 52c1f472a5bfe908ee72c48e8cac507cdf25c30a
parent 4a13731f08648056f8aa257d7b3eb8af444af9fc
parent 83a73d7d5025c5c3148ccf655ea68aacb4885160
author Eric Biggers <ebiggers@google.com> 1570475384 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1570475384 +0000

Merge changes from topic "fscrypt-key-mgmt-improvements"

* changes:
  vold: support v2 encryption policies
  vold: use new ioctls to add/remove fscrypt keys when supported