tree 3a5b26e145f6189bd77e7bf27090cad9404ff208
parent 31458c02add1b98a2ab1214c905bafd5fce9a64a
parent e5cc96d8dd29572c4f957ea41d0c2801c084e3e6
author Xin Li <delphij@google.com> 1567971959 -0700
committer Xin Li <delphij@google.com> 1567971959 -0700

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

No content change.

Bug: 135460123
Change-Id: Ia45bb3f56097f85a9f262349df2165736e52624c
Merged-In: I2bdaf1520b9e5ad8a4a8ed2f5b0bf3d8c33f083f