tree deee8fd4223d2061f1cb754cd06417e95c64eaea
parent 80bc55240703f7124e51fd68777ecfb2a5f81c49
parent 3d0e53b900fd8e721733b7d54a1acef694a47333
author Xin Li <delphij@google.com> 1572476692 -0700
committer android-build-merger <android-build-merger@google.com> 1572476692 -0700

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

Change-Id: I8155c126e5b9d30f6b943ed45c5b047df087a4d9