tree 419867b7fedb2f2f3e1e52f49662b9eed0586126
parent 1cec8518e98239e5cb9a55f06b2ce008d282f979
parent 79e7951bc1f03d4b42fbf091f2ad031774a2d916
author Xin Li <delphij@google.com> 1572556020 -0700
committer android-build-merger <android-build-merger@google.com> 1572556020 -0700

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

Change-Id: I02c72c08ff526205abb7c7f5fa076a04781e46c7