tree 269e085d6ada7d553d7b5a3339c05463d1eaa9de
parent 4cd7092cc32f19246e10cfb81da46002123f6a65
parent 7c05c673197996a302e09938d62bd2425b8124ba
author Xin Li <delphij@google.com> 1572471774 -0700
committer android-build-merger <android-build-merger@google.com> 1572471774 -0700

DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
am: 7c05c67319

Change-Id: I915754e2be7dec571fa73bc3f470663c4067ba4f