tree 35950b15531836715da1980005502ab50e5222b8
parent b0838843e019a232f9a439f895a658f58a369bd0
parent 7f184af7f95c2d4a6452d15f186bfbe23995b06f
author Xin Li <delphij@google.com> 1562097740 -0700
committer android-build-merger <android-build-merger@google.com> 1562097740 -0700

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

Change-Id: I074b6e0452cc7957371478f92799ed7c777c7262