tree 4d64f60f16d830aee36ae84a9e6a381bff5a7b7c
parent 1ca377ab534b0f42aa2acd81da7a8482e5018f59
parent 3c1edc620cca062f3aa65036226e222b13573ae1
author Xin Li <delphij@google.com> 1567980431 -0700
committer android-build-merger <android-build-merger@google.com> 1567980431 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 3c1edc620c -s ours
am skip reason: change_id I27571e65a8dcc632f538969dde42a4e99ae3a487 with SHA1 53ea2a0a7b is in history

Change-Id: I59294f172773906a27614da4b24a4b7afb55aa90