tree c61d828952e2f72bc8f7df9b960fa475abb53c15
parent 594daa9d82201cdd57ceb98a00dd99c20cdbb65d
parent f5d1330bac2edd68718b6030170bc67ebdf45665
author Xin Li <delphij@google.com> 1565915276 -0700
committer android-build-merger <android-build-merger@google.com> 1565915276 -0700

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

Change-Id: I10419d3b272c5ef7a152510de59d42e88505838e