tree a3bc20f36882d83c3049f7ff6e72a859f7067570
parent 92bae24b880abf1935df4fbe647e0465e625cb50
parent c1b6dc029599a9f2a4c7fee125344d664bd4812b
author Xin Li <delphij@google.com> 1562099372 -0700
committer android-build-merger <android-build-merger@google.com> 1562099372 -0700

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

Change-Id: I171c52f5da15da26e28c83d312864aa25c22bee2