tree a7b55376118488845a4df9a2996746eeb74ada30
parent 393923b2cf58cac5370485a5b7cfbcb504c75831
parent cf52221ba4a2171d79c96d19e37f2bf2afc7c8fd
author Xin Li <delphij@google.com> 1565920103 -0700
committer android-build-merger <android-build-merger@google.com> 1565920103 -0700

[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: 1e1d3c8725 -s ours am: d545844400 am: c7a33bf6f4
am: cf52221ba4 -s ours
am skip reason: subject contains skip directive

Change-Id: Idcaa2bcba7fd94b8e8e29dc140e1a89b8c158a34