tree d5199b422abebe70b97ee7f878989fd79de77858
parent e8361ba0894fb606fbdeaa80b6607c41325164a6
parent 76ab1202dd7206d33c621452663cde2e33c68614
author Xin Li <delphij@google.com> 1562099130 -0700
committer android-build-merger <android-build-merger@google.com> 1562099130 -0700

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

Change-Id: I08f6fef2878b48dd06e472993fcd3f19c614c8e6