tree 7e5d6490153e12fcb07779443f3345a2ebda99c8
parent 75e56f882fd39635655ef5e13cb8174db66ed894
parent a90a724d59478ddc4c510cfe389aca55fbf7a79a
author Xin Li <delphij@google.com> 1567980326 -0700
committer android-build-merger <android-build-merger@google.com> 1567980326 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: a90a724d59 -s ours
am skip reason: change_id Ife0f708744ff9b2efdf900b9b5d58555f1487a11 with SHA1 d0da96f292 is in history

Change-Id: I0080389a9a4dbbb122f78dc500a918ff96a87fe9