tree 94c17e8d05625433aa0fe2ef9bc3d15afa422971
parent 56e37a4ab1056fc946ab66c34eff5902b061c68c
parent 5d46637e61e735e13891ef071b23d4f6a17b48ba
author Xin Li <delphij@google.com> 1562098255 -0700
committer android-build-merger <android-build-merger@google.com> 1562098255 -0700

DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
am: 5d46637e61

Change-Id: Id171378b87ac09f200a50ff776c6974a041d0e8f