tree 499e089d193efa50f8b4c11d7cdd723c26c680a8
parent 62ac24fb26de6c5d35caaaa83e094346adbde004
parent bc2773bcf335d859b9842bf3ffe2d80f3c5ba6ac
author Xin Li <delphij@google.com> 1562014796 +0000
committer Xin Li <delphij@google.com> 1562014796 +0000

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

Bug: 134405016
Change-Id: I53805c42dbe71bc51c9829d51364a74756551174