tree 994917bfe4c52a7ef203b8e4269402670aeef5fc
parent 879d340c83f4cc0925a072e5a87492b5789a2fad
parent 4157616ba2a705a6c8c50f3f7c73582e78587a4c
author Xin Li <delphij@google.com> 1572471639 -0700
committer android-build-merger <android-build-merger@google.com> 1572471639 -0700

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

Change-Id: I3a78276b761340dc263da8cc6929f33888938fb4