tree 3e4059b0fcf350b58a95cb23e1d4adda48064468
parent 1e017ab7c32b855c78e46798923062bc338030b3
parent 22c1485a8f9f8fae336bfe0d42935a1a6892c567
author Xin Li <delphij@google.com> 1567971823 -0700
committer Xin Li <delphij@google.com> 1567971823 -0700

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

No content change.

Bug: 135460123
Change-Id: Iff029275a987dc4812036e0af61277a5ae7b9c19
Merged-In: I2f97c75036ec82748707c78058b9818ea42ae893