OSDN Git Service

Merge changes from topic "vold-use-keystore2" am: 08873d0d7d
authorSatya Tangirala <satyat@google.com>
Thu, 8 Apr 2021 00:52:41 +0000 (00:52 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Thu, 8 Apr 2021 00:52:41 +0000 (00:52 +0000)
commit54460f0635dbf16aaaf0a6568ff8e872692f5eb5
treeb7b56facd873c3443b15666f7f516580b138642e
parent7a8ac746a286038cb0627501d4440832f26d9748
parent08873d0d7dd4d4512ea7a1140cb69079b6254d69
Merge changes from topic "vold-use-keystore2" am: 08873d0d7d

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

Change-Id: Ie7db671fc7e90fa86cf84773786ea6afaab37a7f