tree 12877fa8fb09b4b27e1a569552d856952a91b8e2
parent 5acfc3e8d5082b79b7a7f93ce52e0d0a535e4226
parent ee1a70c1291d6bafb13ec6847444822072e0218a
author Eric Biggers <ebiggers@google.com> 1597100031 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597100031 +0000

Merge "vold: use __ANDROID_API_Q__ instead of pre_gki_level" am: ee1a70c129

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

Change-Id: Iacb41f3dba6c2a57943f766b749d87efe6f4e4b3