tree 2250d0ca95b1f4d9737844a407824a5914a4296f
parent 950c70193732e37303dc7b9b765b3ff3154fc9d2
parent 3daceecdf552f3eaa2d6dfe621da1e6b36d13fba
author Xin Li <delphij@google.com> 1562109986 -0700
committer android-build-merger <android-build-merger@google.com> 1562109986 -0700

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

Change-Id: Ied09661b1e5a72af6b246ab9b4531c9c2a3c84af