tree 56f101640cdb400eea15c75bf898f253bf5943ef
parent 779d7d3a3d7a3d9b150afe6a6e9b28317e7643af
parent 317fc9a2f166f69bc6e989313ff034603224b2b7
author Xin Li <delphij@google.com> 1562093985 -0700
committer android-build-merger <android-build-merger@google.com> 1562093985 -0700

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

Change-Id: I53af26cc12b7f14f235d525fc7d8ed85415bb7b7