tree 0223b7b244ed4da87fb122f5f41ea04605a9eba0
parent cf3151df2607bed00fc8124ed72eda11ade36ab0
parent 4b4e6198d4de0c94526c820e6a25d5d46d83237e
author Xin Li <delphij@google.com> 1572470618 -0700
committer android-build-merger <android-build-merger@google.com> 1572470618 -0700

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

Change-Id: I62cba1094144b252cc5c8265acea5038ddc11400