tree ee504edf9d20df04a19972d922e5cdcfcb4df7c3
parent b827d4d70ac55beea081a29d9967fa9d9581ebde
parent 91d6e48346aa00811bb170727cef0559365e6c35
author Xin Li <delphij@google.com> 1567971899 -0700
committer Xin Li <delphij@google.com> 1567971899 -0700

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

No content change.

Bug: 135460123
Change-Id: I71c63c6080df92d295fbd8393c38c22ab19107f5
Merged-In: I8f31654013e9185123e651c59c442dd2d1a6b8b6