tree 9a5ba7f97635093d8c8398d73e527ab9a088f463
parent b4cde0acce7d7203b79ccfcf53964eaf1bf54200
parent b7886e91ee8cd03694a5d7ef293c88a429253217
author Xin Li <delphij@google.com> 1567981168 -0700
committer android-build-merger <android-build-merger@google.com> 1567981168 -0700

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

Change-Id: I29047a2bd84f8cb0de501404be0defdcf6da547b