OSDN Git Service

Merge "Make vold use the updated keystore 2 API for storage keys." am: 68bdb45cf8...
authorHasini Gunasinghe <hasinitg@google.com>
Fri, 23 Apr 2021 23:48:18 +0000 (23:48 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Fri, 23 Apr 2021 23:48:18 +0000 (23:48 +0000)
commit33f9b160a20dbd219967e40f6bba61e76da443ae
tree63eff7f4eae9d731c6761f684ddd66de4caf6978
parent5b6c40e3c0dbc8e6626c70ec3475905dcec9d11c
parentd14ab5c35cce64a50d664783fecf13d3cb53011a
Merge "Make vold use the updated keystore 2 API for storage keys." am: 68bdb45cf8 am: 0e9eb8ebca am: d14ab5c35c

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

Change-Id: I26878bfc82857c05539c1a2705ddcb3fad0c3fb4