tree c42a90aacfe1c07af564ada7ea03e559767ab543
parent d73843847d6591eb895b70a7235b7088084d9df3
parent 20d571cc4c24210939932b53f8119b98fd45ebe5
author Xin Li <delphij@google.com> 1562014795 +0000
committer Xin Li <delphij@google.com> 1562014795 +0000

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

Bug: 134405016
Change-Id: Ib8768a5fcf08db368aa2958240af01d975acc449