tree db22aa44e192ae2ba85ba897457a0a751d718f19
parent 889541b8d90ce7f81fba7917049f01a82203b2bc
parent 6677caae1a4c727f4efd1a11638cc87782b72f05
author Xin Li <delphij@google.com> 1567971922 -0700
committer Xin Li <delphij@google.com> 1567971922 -0700

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

No content change.

Bug: 135460123
Change-Id: If970033d0e34638c23811665a834e4d32a64ce96
Merged-In: Id15a0e7908a1feee86bab8cedd06024518107dd5