tree 2250d0ca95b1f4d9737844a407824a5914a4296f
parent aae64670394e9c9fb29a3a2410a804e7226745c0
parent 2e1c5e9b0cf88594645171c42e737daf18f95366
author Xin Li <delphij@google.com> 1562096984 -0700
committer android-build-merger <android-build-merger@google.com> 1562096984 -0700

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

Change-Id: I10c3e36994637d241a0b4ed6acf4833d44c43d10