tree 4bad395092683f90a4d471e38bd68ac081920adf
parent 2c591c679b814961af13a4b7993998b360701fcb
parent 51b8c6664df6b83475808bbfa52bb39fb2d2e49a
author Xin Li <delphij@google.com> 1572555988 -0700
committer android-build-merger <android-build-merger@google.com> 1572555988 -0700

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

Change-Id: I7930551dbe0ad1d17020a60cd0b9f8a81eb41fd2