tree 383c3e355db0910ba3a513b1f837375c5656106b
parent 77cb85583fe28328f2a1f6e7e5b04808a712450c
parent 8ed7a370bef4647c82fe5b22b0696ddc715b706b
author Xin Li <delphij@google.com> 1572470702 -0700
committer android-build-merger <android-build-merger@google.com> 1572470702 -0700

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

Change-Id: Ib2581c0626d0f89c70dd04671bb15dd9d51ad1a7