tree 4d64f60f16d830aee36ae84a9e6a381bff5a7b7c
parent 53ea2a0a7b537926f4e45523bc6454000eb54bfc
parent 1ad51cf985c07772682f85d6047eb325a0b17291
author Xin Li <delphij@google.com> 1567971804 -0700
committer Xin Li <delphij@google.com> 1567971804 -0700

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

No content change.

Bug: 135460123
Change-Id: Ie9223435a962512321e7a10c1d262d15735c8bfa
Merged-In: I27571e65a8dcc632f538969dde42a4e99ae3a487