tree 3a5b26e145f6189bd77e7bf27090cad9404ff208
parent 417ad51c260dc9d0bfc6b64e567fa67b112c1560
parent e5cc96d8dd29572c4f957ea41d0c2801c084e3e6
author Xin Li <delphij@google.com> 1562110570 -0700
committer android-build-merger <android-build-merger@google.com> 1562110570 -0700

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

Change-Id: I799022c5234f036b0eb0d1cc69f4829b63d52497