tree 637d50c0f3ce3fd0ce81c05fc2180174820b42f1
parent 5f6d86597e141c53c346402d2531b6d5421f1b86
parent 6207c9cde4804539ebb1d1b7c29b2ddf14b2e442
author Seth Moore <sethmo@google.com> 1611710194 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1611710194 +0000

Merge "Add support for binding storage encryption to a seed" am: 6207c9cde4

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1553317

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d60971d77f26bb43a73938895f9e343ced7081a