tree 6a561f5379c73c4eb7ba64915284437755028320
parent 82cfd95c614cd8462da304883dd1a0bdf8d11d08
parent 59deedc9c468ce8ae0f10e9c30742fd6f3ac82b7
author Xin Li <delphij@google.com> 1572476634 -0700
committer android-build-merger <android-build-merger@google.com> 1572476634 -0700

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

Change-Id: Ie97a31ce98b2ffd433c670c7a642586dbb3f4008