tree 4eb757fbb8222db417a35f5b9e1fd8b6e7d3384a
parent 05b64c1243cb867cd4727e7929595cccae270e2f
parent 9cf9865a7e2cbb67f26c9574d72be7575e334b2d
author Xin Li <delphij@google.com> 1572470672 -0700
committer android-build-merger <android-build-merger@google.com> 1572470672 -0700

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

Change-Id: I762e260d69a6d80c8b5ec70a3d89196f3564894a