tree 99a6f20963d7d89d8fd066d42841932fd0a0f7e9
parent c8622732d8ab612ffe3dd6ffd027c28b6d416826
parent 481c220b0b15b5ab5808e4f0d648333c9b772307
author Xin Li <delphij@google.com> 1572475085 -0700
committer android-build-merger <android-build-merger@google.com> 1572475085 -0700

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

Change-Id: I3a6d30448b2248807a5edf579f72bb6ed885b75e