tree 499e089d193efa50f8b4c11d7cdd723c26c680a8
parent bc2773bcf335d859b9842bf3ffe2d80f3c5ba6ac
parent a432ea9dedb33fd0d612e5d216b3a571a1524916
author Xin Li <delphij@google.com> 1562096834 -0700
committer android-build-merger <android-build-merger@google.com> 1562096834 -0700

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

Change-Id: Ic0636201c148af9b7f1ee4a5b76ff4196fa0fff6