tree 3f3e6410fd650bdce59d0bc4eb8d3ea8ad98225d
parent 28a7990a9803bce586a88d5418aaf0c87edc1fbc
parent fe7c9dac98d2dc8336fe839056042a531e8d13f4
author Xin Li <delphij@google.com> 1572470676 -0700
committer android-build-merger <android-build-merger@google.com> 1572470676 -0700

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

Change-Id: Ibd3706947c652a3ded7635f80e846501da50d4ee