OSDN Git Service

Merge changes from topic "vold-use-keystore2" am: 08873d0d7d am: 54460f0635
authorSatya Tangirala <satyat@google.com>
Thu, 8 Apr 2021 01:36:42 +0000 (01:36 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Thu, 8 Apr 2021 01:36:42 +0000 (01:36 +0000)
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1649730

Change-Id: I8a70c04881275aa5e3bf4cf629316870798df27a


Trivial merge