tree a7b55376118488845a4df9a2996746eeb74ada30
parent 462e433de5e0600ebacb2466fca5887ce8c0d7f6
parent d5458444002efe4b70f39707052e3d646028f8c2
author Xin Li <delphij@google.com> 1565915506 -0700
committer android-build-merger <android-build-merger@google.com> 1565915506 -0700

[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: 1e1d3c8725 -s ours
am: d545844400

Change-Id: I0edbfa7760e350471734028f7633e6b122c9acf1