tree f80a64336a9f71c258aa53a7780ea54c787e7044
parent d3150f5a8e5a917672af5f88f8fed3af216dd3d4
parent db24d4d05849a3f1d88f7e4588ca2da4fec80264
author Xin Li <delphij@google.com> 1565919997 -0700
committer android-build-merger <android-build-merger@google.com> 1565919997 -0700

[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: e92f785c7c -s ours am: bc1767d387 am: 84f007cd6e
am: db24d4d058 -s ours
am skip reason: subject contains skip directive

Change-Id: I5d3c2a382e9388d23bf4cc4daea74c6c86356f3f