tree a1a984e8c94750699cbb0931b59a6d5890a947f8
parent 6176b78314023e9e40c7ed72edafcc05eb863903
parent abad1baa616d69efa98da673448ad6b7a5d92b8c
author Xin Li <delphij@google.com> 1567971829 -0700
committer Xin Li <delphij@google.com> 1567971829 -0700

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

No content change.

Bug: 135460123
Change-Id: Ic83ac9fe78ad277f06f9ee5952c57c919c3693ce
Merged-In: I5f3596d149f2f4319f780b43f38a1967a6ca2f51