tree 95c4a9523457d2f0b437203e83e5646eac55f471
parent cd444504576b3f44b1c8ac90d684521c55d93fa2
parent 8f656270df6deda5137e6429b017762b033d2380
author Xin Li <delphij@google.com> 1565813878 -0700
committer android-build-merger <android-build-merger@google.com> 1565813878 -0700

[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master
am: 8f656270df -s ours
am skip reason: subject contains skip directive

Change-Id: Icac25c09de5cacb4316941906e37c1fafa630a66