tree 32004465065b431a8ed1c140d25898dee2cee756
parent a205ce261766cffe2dd8f9bab7cfcfe036a80803
parent d581c0ae70655e4c18ff00182867c81600f408a8
author Xin Li <delphij@google.com> 1572471852 -0700
committer android-build-merger <android-build-merger@google.com> 1572471852 -0700

[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: ce9bc12ea7
am: d581c0ae70 -s ours
am skip reason: subject contains skip directive

Change-Id: Iad879a964e5705cfe670a6567184b91d5e9d07c7