OSDN Git Service

Merge "vold: remove checkEncryption" am: 2d9777bfbf am: 15c0d3e5d0 am: 4cd238b900...
authorEric Biggers <ebiggers@google.com>
Thu, 16 Jul 2020 21:54:18 +0000 (21:54 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Thu, 16 Jul 2020 21:54:18 +0000 (21:54 +0000)
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1363339

Change-Id: Ifd363d28586b1d91092c2eb0f93b1e57ec965d79

1  2 
VoldNativeService.cpp

Simple merge