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

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