tree b62fa93b4e797bc596b75eecd14be4a72c73edfd
parent a1dcd25816ac67b5f1c657c1856da9cd718b5fdd
parent 3809f3dd127716a59f14536b19fe5cab0e0a445e
author Xin Li <delphij@google.com> 1572473348 -0700
committer android-build-merger <android-build-merger@google.com> 1572473348 -0700

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

Change-Id: I0fca81579070a66640d3c5e73945f5e29e061424