tree 496be141e3036ad787eaacd335437070e74df335
parent d5ab34e46bf80aae3d02469fdd3d120ec324da4c
parent 8f61481f7fd0568e56f5d389811dd52934dcdd9d
author Xin Li <delphij@google.com> 1562105955 -0700
committer android-build-merger <android-build-merger@google.com> 1562105955 -0700

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

Change-Id: I5e8360b55b6a8978787f6abdf2bf6465a760d616