tree e46c0ea7a249ff779c38de1f76a498989be40885
parent 4740356d3121c8e826cf974800d3ae2315d3df7a
parent c25d314f218cedcc7b9ba0fdacc3d81b1fd50aec
author Xin Li <delphij@google.com> 1567982299 -0700
committer android-build-merger <android-build-merger@google.com> 1567982299 -0700

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

Change-Id: I143c0b1dd28ba679bd9917b22a18cd8bef3e34a2