tree 6d405b3b9e1caf9c843eb0ceef69fbfd23d3b170
parent 8acb6df218d8728ea196e9b4025ad4d72701f079
parent 3964dd554b2602df5150aae927b2b7a3856f79eb
author Xin Li <delphij@google.com> 1567973218 -0700
committer Xin Li <delphij@google.com> 1567973218 -0700

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

Bug: 135460123
Change-Id: Id717354dc93795e904588023b6e79d2ccd1ba2e0
Merged-In: Idf5a1366c365b45a542eb63e110f32c5c1a662ce