tree 994917bfe4c52a7ef203b8e4269402670aeef5fc
parent 606281348879ac80ceea945a2d519c5927b752eb
parent 95c3139bbee718a3980feb685ade28affe92ef86
author Xin Li <delphij@google.com> 1567982798 -0700
committer android-build-merger <android-build-merger@google.com> 1567982798 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 3ee74659ab -s ours
am: 95c3139bbe -s ours
am skip reason: change_id I9c84a0c1f8be7e5e24702cfafb773b3bbf97ceb3 with SHA1 607711c60d is in history

Change-Id: Ie7c42e9c6aca53906e43331a4aa04b6a971e9512