tree e4cb3cbe173c7f08912980b116fb5b3d6f6357b8
parent 067340e0f90439daef556e885b1592a54c16f408
parent 62a6e52515045ad51fc4764d36f72e4a602f0fc0
author Xin Li <delphij@google.com> 1572470659 -0700
committer android-build-merger <android-build-merger@google.com> 1572470659 -0700

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

Change-Id: I98dc15debec7844b7b6550010980765e336b21d7