tree 3fa6b4d9b35e148a0a8cf0ea7e1723dc6e1acef5
parent 9ad9c5ee71e073538f0f7c034739b9d7f79a0dc3
parent f061a94fecd30f063b7e02f47044e10c0bfbb13e
author Xin Li <delphij@google.com> 1572471776 -0700
committer android-build-merger <android-build-merger@google.com> 1572471776 -0700

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

Change-Id: I68ee936500392cb7b8844dfde58987c41888b209