tree 8f7b26a82447552a380c57e270c22d542ed96e03
parent 7214f7d804c65bb574ebd29fbf8f9bcd4ac1d8ef
parent 3a8c4983701fa7dfcb62ce277a70823f153a212b
author Xin Li <delphij@google.com> 1568239210 -0700
committer android-build-merger <android-build-merger@google.com> 1568239210 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 81c7420245 -s ours
am: 3a8c498370 -s ours
am skip reason: change_id I201f79c31638100197e93392b2404efcb68eaace with SHA1 fc2114db73 is in history

Change-Id: I5f8d1b3173c521b2bd24dcaf7b072ea6fd806017