tree 58ddb750f3c58a1ff73eec2820e267d3514586ea
parent e84b6cff7c2dccbe278a6b4e0d2d47c8f50f2f36
parent 17f7086ed297f7b067571cd1ba4cee042f4b8d44
author Xin Li <delphij@google.com> 1572476577 -0700
committer android-build-merger <android-build-merger@google.com> 1572476577 -0700

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

Change-Id: I49ee07d8ca006658722402e5b2b9fe3a8d688d37