tree f8c2c62094e102fa8e3922e1702a31fc35e0dcfb
parent 3ede4fb7d6fea01937f70dd5fecb48e47633661d
parent 9c3e3982647b3b0780169b7eaa4cd7a3135f0924
author Xin Li <delphij@google.com> 1572478141 -0700
committer android-build-merger <android-build-merger@google.com> 1572478141 -0700

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

Change-Id: If6c4a71223223dcd79a50f71feb3ef471c4f5198