tree 383c3e355db0910ba3a513b1f837375c5656106b
parent a3e9dfa5413f37877b3f981d5bf91febe58e94fd
parent d921a46f26454b774ce9343a78d4c4e9022f509d
author Xin Li <delphij@google.com> 1572469294 -0700
committer android-build-merger <android-build-merger@google.com> 1572469294 -0700

DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
am: d921a46f26

Change-Id: I2ad829d4d3034d1169cb56c388a41fff535959df