tree 36bc6ed7788200e105ca4f24162ac59aacb6cc4b
parent 42e8d5a878617cf6b5fe52fa567b50d0e5cdd751
parent a93c7ebf80a53aca31a5b21915cea0b9ce7dda1a
author Xin Li <delphij@google.com> 1562096775 -0700
committer android-build-merger <android-build-merger@google.com> 1562096775 -0700

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

Change-Id: I147bce10af9c1ba213c45407e0808d4f4cff336b