tree 089fb3cfa785f04574042327a364039fa459bb24
parent be9fc1e192be17f2246707153aee80162cff64f1
parent 66e5104f9f8fce77cfc61571d07458326db9fbc1
author Xin Li <delphij@google.com> 1562110213 -0700
committer android-build-merger <android-build-merger@google.com> 1562110213 -0700

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

Change-Id: I611179f7ba1797de5b0bd911aa5c737c749d720b