OSDN Git Service

Merge changes from topic "encryptinplace-cleanup" am: 91e4f1dd76
authorEric Biggers <ebiggers@google.com>
Wed, 4 Nov 2020 19:15:05 +0000 (19:15 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Wed, 4 Nov 2020 19:15:05 +0000 (19:15 +0000)
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1467990

Change-Id: I50e47bd1cb102b9013542b0676258a79ac44b6b1


Trivial merge