tree a498fc17004b9846fa254f4682d7f07421bd6903
parent f9770dfef59c08b52a69ed3f58d20f7328898bcd
parent a82a6f86c4654775a66de52af4c4e42e118b51e6
author Xin Li <delphij@google.com> 1572476482 -0700
committer android-build-merger <android-build-merger@google.com> 1572476482 -0700

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

Change-Id: I149fa7e974db37b641ef616a115de55dd7edace7