tree ce202cbbfd6f17de3df40daa0951cbb6e073128a
parent 01e898384e36ea8fbec93c7d780d1cbe85e273d2
parent 7256fe0bb205ed0c6597e62cb63295a2f05e1e6c
author Xin Li <delphij@google.com> 1567971833 -0700
committer Xin Li <delphij@google.com> 1567971833 -0700

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

No content change.

Bug: 135460123
Change-Id: I24e5e38765de4e1a309deb1c54c0572478677134
Merged-In: I1dc1105688ca3684b3c2ff66ebf69cb58d6722cb