tree ce202cbbfd6f17de3df40daa0951cbb6e073128a
parent d03fa44a8b3a0e94ec336c73025914eb515c9265
parent 385dcd8b63a4f3fe2b49b6b18c69fc565840cbb1
author Xin Li <delphij@google.com> 1562097923 -0700
committer android-build-merger <android-build-merger@google.com> 1562097923 -0700

DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
am: 385dcd8b63

Change-Id: Ie6854b289d097ced0d87222fbeb6c361324b92a9