tree f134e344785f93f01075e82930c93b4a1e8cc0f1
parent d0d6c57555b1ad0f8dc5929e29b5a098ed656661
parent f29d6146d06e277582c3df1025b04491c4b1114d
author Xin Li <delphij@google.com> 1562109097 -0700
committer android-build-merger <android-build-merger@google.com> 1562109097 -0700

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

Change-Id: I675bb70cba37003f58c90d50cd9ab25f658ba385