tree 74ccc78f47c0f5e49729ef26516e4d524ff02833
parent a0a0a01968695a3b9d94fee409c02c460d18bb27
parent eeb43cc103f86efb51a0be45c93198e8364511c7
author Xin Li <delphij@google.com> 1572470655 -0700
committer android-build-merger <android-build-merger@google.com> 1572470655 -0700

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

Change-Id: I62f1079e81cef2db1cda361be262797fac7977d9