tree 32c441875f02093294b93b03ebe11a05739fc09c
parent a1189052ff75ba94bbe018c65abc7b3a1b187c26
parent 86eefdac894645aa97aff79fb9655ec58d3fc5d0
author Eric Biggers <ebiggers@google.com> 1597103028 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597103028 +0000

Merge "vold: use __ANDROID_API_Q__ instead of pre_gki_level" am: ee1a70c129 am: c6f47996d6 am: 124f3575be am: 86eefdac89

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

Change-Id: I1b72ac80a0c369039a7b6e405715baef1c3481b5