tree dd55545f4fb0d60d4a2ff98e434bd8ddf533879b
parent 91ddccf479e4372397b9660265fa7d48174a7eaa
parent 60fe5d703379afff99efcbfc15999a5a65ed25c4
author Xin Li <delphij@google.com> 1567983614 -0700
committer android-build-merger <android-build-merger@google.com> 1567983614 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 4281c5654c -s ours
am: 60fe5d7033 -s ours
am skip reason: change_id Iec9970d4c0a3348b9a8aba76fb2ac042fe2453db with SHA1 d454d2a0b9 is in history

Change-Id: I7d8600d46111c6dba418fde67393f1e2a97355c5