tree 57c40ff1bf8dbe312d5784bb5136079c94f62862
parent 3cb20656d99773776a207848fafd5da4fef97f77
parent fde9873115a3c056975e18f83d30e738b2ae5054
author Xin Li <delphij@google.com> 1567971829 -0700
committer Xin Li <delphij@google.com> 1567971829 -0700

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

No content change.

Bug: 135460123
Change-Id: Ia9469518ab48a50e37558b542d233cb7ae35b85b
Merged-In: I2681ab4a191e84c0caf17e1e8f1f82196a172f8f