tree 5304eaa216318e8a16d69211e9b7f7a1f4a457f5
parent 2d3846ce99d56c043f73d14022678ebc33dac75b
parent 49d8afb7998edffb82f8ba4388f607ec2c43136e
author Xin Li <delphij@google.com> 1572473469 -0700
committer android-build-merger <android-build-merger@google.com> 1572473469 -0700

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

Change-Id: I609e0321d028deaa75b2365e1e41e48e2aa17b18