tree e9124f9a4b705e936dbc84ae61795ed41af94681
parent 38ed224625430c8828e44b5ca38ea18ec5f66e53
parent beca8bd5fa5893afe522ff339f45e99ea8649e5c
author Xin Li <delphij@google.com> 1567971927 -0700
committer Xin Li <delphij@google.com> 1567971927 -0700

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

No content change.

Bug: 135460123
Change-Id: I75b2c24d0dd0e9478727351f4fd0f0be898e815e
Merged-In: Idc05da05ba506ef82c18bde571bc95171f0a7e2b