tree b62fa93b4e797bc596b75eecd14be4a72c73edfd
parent e876e28b880814b3756e1cde275e3109721f8e43
parent ea6581738e54ed1b40f19be5edf204eb84c50a17
author Xin Li <delphij@google.com> 1572471574 -0700
committer android-build-merger <android-build-merger@google.com> 1572471574 -0700

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

Change-Id: Id608e9c6cee68aef21c0a90089fe2e534e1c8d5b