tree 41df071739359e1fa20c173b52dbc125682a1aa9
parent 8e0780cba28d974bd1dc3289a8eedbbfa6a8942b
parent 886e572009bd09c3f2cc59d7b0e1683d76ef303c
author Paul Crowley <paulcrowley@google.com> 1582067827 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1582067827 +0000

Merge changes from topics "metadata_wrapped_key_aosp", "volume_metadata"

* changes:
  On newer devices, use dm-default-key to encrypt SD cards
  vold: Wrapped key support for metadata encryption
  Refactor: make makeGen local