tree e3d2ceadfd465d7a5381f4e1e52270e5da4ea1ca
parent 6aa5607fc98d65d4d2d8418fe7f0fb1eeb45ea4f
parent 0a934061cfaa974ed32e33a5821923267b7c338a
author Xin Li <delphij@google.com> 1572469178 -0700
committer android-build-merger <android-build-merger@google.com> 1572469178 -0700

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

Change-Id: I53d5e1341a3df2970d6a448efef8c37ab3adb44e