tree 676b9d222520eb3561227e1dc134b6063b7dce15
parent c65dc37da558959687708f4cce7a59e1020ef29c
parent 09fd7dd7e4475a5e8d6852fe76099bcdb6f62b79
author Xin Li <delphij@google.com> 1572475159 -0700
committer android-build-merger <android-build-merger@google.com> 1572475159 -0700

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

Change-Id: I9013a3355c739e5bef7ad7bca8e2ce5396582497