tree af1a7f93899689624aa78b8a65ff29cba2eb5086
parent 52b6cc4a8aa638b5332a6825a65e03a83de4863a
parent 0e9eb8ebca99dbdc7849301df8087183734b231a
author Hasini Gunasinghe <hasinitg@google.com> 1619220335 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619220335 +0000

Merge "Make vold use the updated keystore 2 API for storage keys." am: 68bdb45cf8 am: 0e9eb8ebca

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

Change-Id: I8ee13ffd60784cee2ffbe8ff640b30a0f7716f5f