tree b71d7822f77c69a3e39e974640d9258ff9fc2e07
parent 3e0313b691781da74e01d41ac78d2d5e80102165
parent d4a26eeb429650ddb094bc7249bb8c800de56a77
author Xin Li <delphij@google.com> 1572553224 -0700
committer android-build-merger <android-build-merger@google.com> 1572553224 -0700

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

Change-Id: Iccf535c69440a2d301a7a74b7f6101551783e2c9