tree f45fe9c7a488e3379dc0f48b30ae705a4054d3ae
parent c134a078cff4e56e6e82308aa6a554150397a23a
parent 6748ce85a5d0e84bb77c87bc7ebe73a48628cece
author Xin Li <delphij@google.com> 1567971836 -0700
committer Xin Li <delphij@google.com> 1567971836 -0700

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

No content change.

Bug: 135460123
Change-Id: I2bc57b99adee7d064e89fb2f6a5a772c11b66128
Merged-In: Icbf0718fde5088365502c9e4b410f14796c161a5