tree b8bae78bd30e8a80278968c232d722dd13cba2c7
parent d722d2918271fb2a6658680dd4e74fb5d36324cc
parent 681b0cf9723f3c936aa30c877e781446ea846eb8
author Xin Li <delphij@google.com> 1562017035 -0700
committer android-build-merger <android-build-merger@google.com> 1562017035 -0700

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

Change-Id: I4f76f716c39a19e12ee6f94881ddd1d8e13c9b0d