tree 66489d2e1bffb5661ef2b8daf15e679dca8d7983
parent daf44aea2f1fa32ac665893d11fb8d64bfeda338
parent 5a0dd5d6490a1832467024a65b98a82a963a44f2
author Xin Li <delphij@google.com> 1567973213 -0700
committer Xin Li <delphij@google.com> 1567973213 -0700

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

Bug: 135460123
Change-Id: I7fae8980be7053236188c10a9379bf8fe5914ab2
Merged-In: Icd8b079a9c119fdd02ba79ae0feb19ebedd7f8db