OSDN Git Service

Merge changes from topic "encryptinplace-cleanup" am: 91e4f1dd76 am: ee175c954a
authorEric Biggers <ebiggers@google.com>
Wed, 4 Nov 2020 19:53:11 +0000 (19:53 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Wed, 4 Nov 2020 19:53:11 +0000 (19:53 +0000)
commit992e8dfdaa48b3f09a18d72f0fec01b3649d7b70
tree656c1179d649fe41672fcd65ed0e02e667ac653a
parent61ffc1b096ed49a1755bafb857af236fabd0e822
parentee175c954a25454969860ddf19bc884ed3022fd0
Merge changes from topic "encryptinplace-cleanup" am: 91e4f1dd76 am: ee175c954a

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

Change-Id: If0f5196b66387b3a195b10c1b48d030f7bb8eb5a