tree 59f590e585ecb91b208553f924394aa0d3c8964d
parent 262c5dfbce3a37c625c848654c49e069cf35016c
parent 48c403b8203a0f54d6fea208653a9dc2704801ea
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580509504 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580509504 +0000

Merge "Rename key_dir to metadata_key_dir and refactor" am: a7463139cd am: 8cf1eda025 am: 48c403b820

Change-Id: I4df8daf1210a31b4ae0e32ee8c04f8f7acdc827b