tree be0074ce9f433abb455b8f86fdcc105a74e25f6b
parent 1cb98205459c2bf30873db4445cf372810ef0fd2
parent ca03b68e127359a2384909952b0fe828a6766c08
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582070722 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582070722 +0000

Merge "Add wrapped key support for metadata encryption" am: 5ed0698b41 am: ca03b68e12

Change-Id: I494fb74aae05a0a61afddbe162d2fceeedff3ac0