tree 78e33fd23bfd46b15942f2494ddc2e3340021ecd
parent eb75a6c105fdcb8b29faa0b40cdc43d0ba68ac7a
parent 549a9d5abb9958ae432a4048af7d50665782b7f4
author Xin Li <delphij@google.com> 1572555803 -0700
committer android-build-merger <android-build-merger@google.com> 1572555803 -0700

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

Change-Id: I02271557b58e8e88bf2efa733d851bcd70cf49f5