tree 1f183f9e7015dd4a9f0dfc448b0a298ef41612b0
parent 8db6ad0d360aa6ebacfdd2d6b265bbf781c7291e
parent 29a2df658e8890145edb72ebf82c30155d66c701
author Xin Li <delphij@google.com> 1572470624 -0700
committer android-build-merger <android-build-merger@google.com> 1572470624 -0700

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

Change-Id: I2ac1df278327732282e4ba305a4bba87bdfd03e9