tree c776d9a054c231a45c3916b2b37a26f8589c82a2
parent 43f45f94d0a4299bf3f4e41e02ce945b6f7fdcc1
parent bca28ead67368d1e9d161268e58c442eb2642477
author Xin Li <delphij@google.com> 1562036163 +0000
committer Xin Li <delphij@google.com> 1562042838 +0000

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

Bug: 134405016
Change-Id: I0d1fc0e5f5f7fbd56d9f1032b806bfe82a5dd08b