tree 812602751258df4932222cba301149e79b232872
parent c046b354979d0c8d99d8c95b556a583f6b98186b
parent 2175c408dc60a6cf22a869b3829d8d0ba6cf957d
author Xin Li <delphij@google.com> 1572476494 -0700
committer android-build-merger <android-build-merger@google.com> 1572476494 -0700

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

Change-Id: I385947cc7ea0754b956d9e4ea7cc2f8b4f380440