tree 36bc6ed7788200e105ca4f24162ac59aacb6cc4b
parent 2cf14239d1ca9d41956b05592d5eb9f18f9d84ef
parent 6859bab6b8e1b5f6238e01611ae1b9b6721840d5
author Xin Li <delphij@google.com> 1562106028 -0700
committer android-build-merger <android-build-merger@google.com> 1562106028 -0700

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

Change-Id: Ib456c0c8ee2dd5e041e8ffcdbb08c1de01fa32cd