tree 83471e5f6424f9a88c0609c8ca62445ce7ee5f0e
parent e4031f2749ff35a0073e59d4013c97ebc731a1a9
parent 40c99d7f10f7ca533de1dc4c0f21c921c8a7ccce
author Xin Li <delphij@google.com> 1572475097 -0700
committer android-build-merger <android-build-merger@google.com> 1572475097 -0700

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

Change-Id: I4ef6b2e2907bd467ba863434e49a89d22c480dd0