tree 1f2e57c92604850a2352915e5cd07e242730be73
parent 2ff91d6dde869d40ee618cd352713b30b53396d5
parent e4aaef8c13ed630ae44b84803ac59ad629f2c01e
author Xin Li <delphij@google.com> 1562087083 -0700
committer android-build-merger <android-build-merger@google.com> 1562087083 -0700

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

Change-Id: I05dccc0212091f220cdaa41c2ad604217823b914