tree 56f101640cdb400eea15c75bf898f253bf5943ef
parent 304c3893606e978760236dbc245581ab8e81a085
parent 457f7ea2faba6335f2f395e950920006249710d1
author Xin Li <delphij@google.com> 1562086894 -0700
committer android-build-merger <android-build-merger@google.com> 1562086894 -0700

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

Change-Id: Ib94a51bbc437761c7bbabb8f45d19102a57489d3