tree 3e3e262fc3766b7fa783d07ee6488c7a5860c60a
parent e9f5fb6e81add65eef873116cccbc9312f3ee605
parent 628248a5e371c17728eca461fc606a1e821336b3
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: I1037d2cd43cd2607de190bc020914c6fdc730b03
Merged-In: I73d74715a8dc817b6aacb7fac3460cad0054be3a