tree 47f41953321b1cb92690ef859d5e6eac090d4773
parent 68876c630316c20605117171b806c5a4c42efdce
parent bc776df7f52b5cd4a7ac52ab344ecda64b72d604
author Xin Li <delphij@google.com> 1562087434 -0700
committer android-build-merger <android-build-merger@google.com> 1562087434 -0700

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

Change-Id: I53c3846726880b65d3fe317d458c6a8160b3cea4