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)
commit10912a295fe24e046eb3373188aa18f7de9d7c62
treeb7b56facd873c3443b15666f7f516580b138642e
parentb79360f80c67e2db3495617622f5dc0fa6f934e8
parent54460f0635dbf16aaaf0a6568ff8e872692f5eb5
Merge changes from topic "vold-use-keystore2" am: 08873d0d7d am: 54460f0635

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

Change-Id: I8a70c04881275aa5e3bf4cf629316870798df27a