tree fbfba66e46e8eb41ed5f18eee646b5cd72dd4583
parent 4105e5e8993510a3ed0c6b0feb4ce65ad2f59b9c
parent 66a3702708ca934117f1217950d4d5abca05380f
author Xin Li <delphij@google.com> 1572471618 -0700
committer android-build-merger <android-build-merger@google.com> 1572471618 -0700

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

Change-Id: I5ef9291bd9cc2d33c50e3fac2e8cafb46922de87