tree d4d0f1ccfa3d6b82ef0a0be0a353328a3001714d
parent c504e1f5f8dadb1fa6c84b9bc14820c4f5470ad8
parent aa06a98b9387bf7cda7948de3f3949e82c151856
author Xin Li <delphij@google.com> 1562098752 -0700
committer android-build-merger <android-build-merger@google.com> 1562098752 -0700

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

Change-Id: I4e7d97a7c2a75aa5ad439fcc68f07c159931c0b8