tree 47c54fbfe43066a80f92920f36b22bcc7120255f
parent ac07a822d2c89d3afc4e00559eeb889b51760408
parent 7ed71f197cf1bf81e071575edd6f8862d4fb58ff
author Xin Li <delphij@google.com> 1572469253 -0700
committer android-build-merger <android-build-merger@google.com> 1572469253 -0700

DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
am: 7ed71f197c

Change-Id: Ic2c6709ff41ff312c92ded214e91b25bf1d5e28f