tree ea232ec5b580b0c70c513b999e97b6f78e55cf70
parent 091c7186db79f7994186eaa0d741ac440051fd1e
parent f9d5ac93e7e4845556669d0a0875f439412b556b
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1557267224 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1557267224 +0000

Merge "Merge "Add SEEK_DATA and SEEK_HOLE constants." am: 1a60589b97 am: fbb1a0b029" into qt-dev-plus-aosp