tree d789df67e1c8e861c18317662da2077a32b156ed
parent 4ab4492c307d7a10780b19ee4336f1390b074b11
parent bb859581cabec49ac5be79a5a14ff22f0736adc9
author Xin Li <delphij@google.com> 1567982326 -0700
committer android-build-merger <android-build-merger@google.com> 1567982326 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: bb859581ca -s ours
am skip reason: change_id Idd1c83dc46f167f4b79092803539c3dd37a88ca3 with SHA1 0faddf9d97 is in history

Change-Id: I1c98918a0b53b5a55fc1bfa2789841cfa0378b43