OSDN Git Service

Merge "vold: use __ANDROID_API_Q__ instead of pre_gki_level" am: ee1a70c129 am: c6f47...
authorEric Biggers <ebiggers@google.com>
Mon, 10 Aug 2020 23:10:18 +0000 (23:10 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Mon, 10 Aug 2020 23:10:18 +0000 (23:10 +0000)
commit124f3575be2c8c4e2b9224d355f7419b14390664
tree32c441875f02093294b93b03ebe11a05739fc09c
parentd1a7e750e2b04d56a201847efbba8b76871a0faf
parentc6f47996d64b3d0e6dba240d65e804240f084f93
Merge "vold: use __ANDROID_API_Q__ instead of pre_gki_level" am: ee1a70c129 am: c6f47996d6

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

Change-Id: I14257e5e427795e8871de5df94696e49766566a6
FsCrypt.cpp