tree 0a2a08307e1abfe274ea41a2d62173fdf0aa6a06
parent ef33d009d8ec509b2ecf9f95fc0471832c7a033e
parent 3f24306890aa6fe2d21213dac46cdf2d4461ff15
author Xin Li <delphij@google.com> 1567971858 -0700
committer Xin Li <delphij@google.com> 1567971858 -0700

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

No content change.

Bug: 135460123
Change-Id: I90a901724edea14a8814d8b9a8326abff615484d
Merged-In: I836b8ceed9e7816ddc2c280cbb9be3b722c51199