tree ce0055d92877382b818ebaa6f346a3a9c1c2cf1a
parent b9fdf8987d73a023f865c905dbea406d209a3ee7
parent 0bdfada40448bae86b6fe1a5f5d5389e14c153e1
author Seth Moore <sethmo@google.com> 1611721186 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1611721186 +0000

Merge "Add support for binding storage encryption to a seed" am: 6207c9cde4 am: 4c110af013 am: 0bdfada404

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I496422108eedcb352d2fb45181ba4fc035c59e19