tree 57450390cce9308a455e9d877e979a8ef4783dd8
parent b4c388b502fbcbbbfc9daaf947776e9c19f79e56
parent ea94f2b5f6e1c1755bebe17b4fd2abc4dabd9acc
author Xin Li <delphij@google.com> 1567983729 -0700
committer android-build-merger <android-build-merger@google.com> 1567983729 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 7b4781cb2a -s ours
am: ea94f2b5f6 -s ours
am skip reason: change_id I42a9409f1842370a61c0065c889f74cca9313a70 with SHA1 7993be3ca8 is in history

Change-Id: I60a7051aae5ac8b73653fddae01da6d49389a310