tree 28ce16b16a7e52db33e3f6e094e396893e0d2001
parent 7900764d17703a6a9d6ce3c7e0142b6c604021fe
parent 522ebff9feeb91a2dadafe42d7d3b67227d622b2
author Xin Li <delphij@google.com> 1567971809 -0700
committer Xin Li <delphij@google.com> 1567971809 -0700

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

No content change.

Bug: 135460123
Change-Id: Ia907ceab022807ac46400d3165141d846fc3931b
Merged-In: Icca1852f77cb4cc70efa1f6ec95acfe013f8aac3