tree 2b5837b769528abd1ae14740282bd1260cdfa55f
parent 0afd1ed0c2ce7c5c943414044e24c3ada63c65d6
parent 848b54cabd8407b9571c89bdc027899535fa577a
author Xin Li <delphij@google.com> 1572476527 -0700
committer android-build-merger <android-build-merger@google.com> 1572476527 -0700

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

Change-Id: I65f9a98ecdba8479823fdde0c11992866fb43153