tree 5e71ae1bdd5dba10c1a6f34c977910fabaf8e8ef
parent 8b05c8d695c81b3d67c04a78c8cb35d79c604607
parent 7d2c8fcfbca1e71c09ee6e554cc351d68849b704
author Xin Li <delphij@google.com> 1562087567 -0700
committer android-build-merger <android-build-merger@google.com> 1562087567 -0700

[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
am: 866363e97e -s ours
am skip reason: subject contains skip directive

Change-Id: I592565f1367fb54066f7c05447598744e1c41c8e