tree e6afa9ffb4ce3225cf6d0478c7876c26292e5375
parent 2356825d5012499597394aa2f7ce67812babca77
parent c5e127da754a101f5b0863dd23b6d082fc5085f3
author Xin Li <delphij@google.com> 1567971842 -0700
committer Xin Li <delphij@google.com> 1567971842 -0700

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

No content change.

Bug: 135460123
Change-Id: Ie89519bea346d984bce2aae0a9dc5ec6f445d718
Merged-In: Iec250219138e8c87e80073e51f89be92ff7c4063