tree c42a90aacfe1c07af564ada7ea03e559767ab543
parent 9ece9137b6905d4fbf5527b7c999dc30f385d07c
parent 3cf79c7e126dcc52a99ea6f2932717d6917df665
author Xin Li <delphij@google.com> 1572476543 -0700
committer android-build-merger <android-build-merger@google.com> 1572476543 -0700

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

Change-Id: Id065829f752e0c25fb4e6f4d4a34c0f4661db0d7