tree 4745a02f425f9bd871a47f2b791dda77b7325fa9
parent 2aee57c9bb5ebeae625e2d604fbbcb5beb705e2e
parent 7a1a9902ecb50aaee909b26880e5da8a7ee5276c
author Xin Li <delphij@google.com> 1562017104 -0700
committer android-build-merger <android-build-merger@google.com> 1562017104 -0700

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

Change-Id: Iacfcb06b1707d60241ee3908091716a2abada9d4