tree fc4c828efc9854fa46dc60117dcfa7364b578542
parent 032d5f742b66f1acc618889d008bdd3948822da7
parent 11cacbe1abe29126db6e51253c9d0c0d0b01f978
author Xin Li <delphij@google.com> 1562014800 +0000
committer Xin Li <delphij@google.com> 1562014800 +0000

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

Bug: 134405016
Change-Id: Iffa76d04a53396d33b64146843926b35b5b469ee