tree b1190ff10c26aeed4af19c48724657cd541f5e8a
parent 7391187b99acf66fedcc686aa725d084474bb67b
parent beca8bd5fa5893afe522ff339f45e99ea8649e5c
author Xin Li <delphij@google.com> 1562109966 -0700
committer android-build-merger <android-build-merger@google.com> 1562109966 -0700

[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 9e40dec411
am: beca8bd5fa -s ours
am skip reason: subject contains skip directive

Change-Id: I90e26a0f90abb70b2587827d9e3bb49106497137