tree af76a18c6b8a12e58ff36a09420199b3819f6f91
parent 906b311f24cbbbebb2b6d73b3807d7599fea559b
parent db7e1a789f0040f14df164fb651675ee708570c7
author Xin Li <delphij@google.com> 1567979378 -0700
committer android-build-merger <android-build-merger@google.com> 1567979378 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 641ebd24c5 -s ours
am: db7e1a789f -s ours
am skip reason: change_id I7f2f300a3ca7d39bbd30cb83b50f68a46eaf1924 with SHA1 4b32be3147 is in history

Change-Id: I1c2a8d2482086ac2c2672c8a5d49ac245082204f