tree fd845444b59dfc72656b7781596e0b1a0662c4c7
parent 8fc996e5c99d0d90093c1a358616e729285f4b94
parent b0dcd4a2c77ad06abaf0870d0d3029432b1756ae
author Xin Li <delphij@google.com> 1572477961 -0700
committer android-build-merger <android-build-merger@google.com> 1572477961 -0700

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

Change-Id: I8d76a8e22b1035c8dbac6eef7d4d9935b909c796