tree c16b251a131cd9d1844a9bf75386bf56e9e81edb
parent 91f5d48daccd6a0bd9b58061d6fa6372a674d381
parent 305f57acae3db551f90971ed7c635fea7647ed66
author Xin Li <delphij@google.com> 1572476619 -0700
committer android-build-merger <android-build-merger@google.com> 1572476619 -0700

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

Change-Id: If9ff9bd863b18dde6936518fd880a275ea9ca032