tree b6428167ddc0ab2237f6a1d7884bcc5ab962c183
parent d4fa46066380df17be26fd3c701f585e18a6bc75
parent d270314d6a5b2943cad518dc9f979368bc7270f4
author Xin Li <delphij@google.com> 1567973219 -0700
committer Xin Li <delphij@google.com> 1567973219 -0700

Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master

Bug: 135460123
Change-Id: Ibb022c79c773191b24aec9bb456bfc6cb01d8e71
Merged-In: I9dbf402e02a0e97e3cffbdde99f7f2b3756b4647