tree 70f5bfad76c1881c5f2d13b1cd370065ab47f129
parent 5d68ab1d31356b04f3c1b0641327ab497c255842
parent 07ae3f16f72503bc71da41efddb08ecf68818249
author Xin Li <delphij@google.com> 1562109623 -0700
committer android-build-merger <android-build-merger@google.com> 1562109623 -0700

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

Change-Id: Ie07ff1b37df9470335fe651b6a4f4fb22df118dc