OSDN Git Service

Merge changes from topic "vold-keystore2-fixes" am: 98692ab9bb am: 545a13a568 am...
authorSatya Tangirala <satyat@google.com>
Wed, 12 May 2021 23:56:42 +0000 (23:56 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Wed, 12 May 2021 23:56:42 +0000 (23:56 +0000)
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1705226

Change-Id: Iedbab84332a8c656150b347664cbb4a0c14ff126


Trivial merge