tree 4ba97625a85753b41d99b98071eaae1ddd5b4d69
parent 02f46e5c6b7e96032d76fcdd6390e89d9ebc0946
parent afb3ff1954f9cfdb3cb30c5b8ceead63bffdb3d9
author Xin Li <delphij@google.com> 1572475146 -0700
committer android-build-merger <android-build-merger@google.com> 1572475146 -0700

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

Change-Id: I05125aacc0e73aa8dff4bbf32f4c731a4eda7157