tree fa62c4f58bc140ba5c0a27e2c913d3ea0a5bfe98
parent a55b37a5648989291e214e21b1fcdebbb287e8dd
parent 4d56b880e2d129757bd0855859da83cad0399965
author Xin Li <delphij@google.com> 1562096422 -0700
committer android-build-merger <android-build-merger@google.com> 1562096422 -0700

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

Change-Id: Ida7e07f2d981f3df794171aba9385dcc691f43c8