tree 05ea21c9dd7d37c0e8c2f5bd4eaf97ace784b5c9
parent 5857caba3d2697cedeaee0fed1ebef4578cd328e
parent b3f1f7cdf559e25e270ffce79dd1a0e1df084785
author Xin Li <delphij@google.com> 1567973214 -0700
committer Xin Li <delphij@google.com> 1567973214 -0700

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

Bug: 135460123
Change-Id: I8a1c305cca7fdc71471c92acf2fd628880592435
Merged-In: Id91aabbe6f7e721a807826d5f0661993e5dfe563