tree a13ef370286a5087ec1a8996bb16fc37712b863d
parent 0deb8aa21b914749cbd0eca07903a55f61e07069
parent 565a5cb181dc3a1a6e050b31626afafa70fcc120
author Xin Li <delphij@google.com> 1565915409 -0700
committer android-build-merger <android-build-merger@google.com> 1565915409 -0700

[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: d6651f2888 -s ours
am: 565a5cb181

Change-Id: I378c158b6c7218c086927740725f41302147700f