tree 68586f4fd910c3b08a9608d7be5e186c9df572c6
parent 19c906e43e925d9dac36b290065e6f8da34c3afa
parent 277f31e141136118ce225502a96ec5080310429b
author Xin Li <delphij@google.com> 1567978226 -0700
committer android-build-merger <android-build-merger@google.com> 1567978226 -0700

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

Change-Id: I9044f99ac8c6f9771e92a9f6f263b1ba13343641