tree db22aa44e192ae2ba85ba897457a0a751d718f19
parent 19056ab3b21c78c1cc5fbc8ff8e55a454c821559
parent 9e491b0f251b306d0a57e5a61168e149e19b395e
author Xin Li <delphij@google.com> 1572476597 -0700
committer android-build-merger <android-build-merger@google.com> 1572476597 -0700

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

Change-Id: I406bf89a1f0e1677b2b1d49b02d4956647ca02fd