tree 39a3f8a28908e4472402613f4ccb3205ef128087
parent 53980bd755405f13357e82d5b4ad9fbe4984cbf7
parent 85015412f25c08bb7adfe12050f742f344b1ada2
author Xin Li <delphij@google.com> 1572475060 -0700
committer android-build-merger <android-build-merger@google.com> 1572475060 -0700

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

Change-Id: I904cd61af0289c6183b7782baf1c0d1a072f8f2d