tree ed52f539f667cce3a18880ccac5853ac1f34a5dc
parent 02ea8f4969c30c4793a5ad4b818c9e075c3bb56d
parent 8f2745c31db3ac75e56af6c39df65f620fcb8619
author Xin Li <delphij@google.com> 1567971747 -0700
committer Xin Li <delphij@google.com> 1567971747 -0700

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

No content change.

Bug: 135460123
Change-Id: I70fc102e00f98edd34b59661c00a8abbe37a8f26
Merged-In: I8a2c42ff322242f08fd6601536c3f9ee50d0f633