tree 13d2d13a7dd73919e095510ee690dceb8abaff6f
parent 29c029eade6d0a29d32cd4bbce522513db14a4b4
parent d9006a80214e5ca5e15a04df71196324bc2bac28
author Xin Li <delphij@google.com> 1572556040 -0700
committer android-build-merger <android-build-merger@google.com> 1572556040 -0700

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

Change-Id: I173b8093f739a7d17dfe48477e1307a87f22d6b6