tree f5d1e4306b4a9dc95ee1a3d2f16d001888fda27a
parent f2b45790fedd8e43d7b5f4703185589e63e89de7
parent e5c25948d939df18624589f91310d0be9a6aaad6
author Xin Li <delphij@google.com> 1567971830 -0700
committer Xin Li <delphij@google.com> 1567971830 -0700

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

No content change.

Bug: 135460123
Change-Id: Ie2aeeed4fe36d22af07475ee3f1699ff041a76fd
Merged-In: Ia37a39990f81e2b8965952c98a2538a3ac377259