tree c42a90aacfe1c07af564ada7ea03e559767ab543
parent 4a914a0c31cac536fd29908deb50b519b8b37f34
parent b003eb81933f47b40f8f073eb6a31c2da3065947
author Xin Li <delphij@google.com> 1567982095 -0700
committer android-build-merger <android-build-merger@google.com> 1567982095 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: b003eb8193 -s ours
am skip reason: change_id I97bbdae04e76ce32de0c25ed580b95ef2ec9a5ee with SHA1 048a25a0e6 is in history

Change-Id: Ibd4cf665daacfe027869cc0c8113c76ed9faf85e