tree fcc0349353273aa62f307117a83b9f1fdb7bbef0
parent f72be932a955a959a21086e67a58011bc2d302fb
parent 335f0efc1aa1b0c64036480255a37a03d8f0d2f9
author Xin Li <delphij@google.com> 1567981779 -0700
committer android-build-merger <android-build-merger@google.com> 1567981779 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 2455137d6e -s ours
am: 335f0efc1a -s ours
am skip reason: change_id I3ec7243ec10f71f4bb7a4464c4563cb6d5be4ad1 with SHA1 6622e9ed59 is in history

Change-Id: Iccaf74e2e41200a02aba84e54f229b102db6e6bc