tree 22c56c00bb0175f63d1dafee59dcd19389fe42f2
parent 4fba1295483df6ee5ced39b2c53bbf69fc679b3b
parent 2b329c75c3f45ab229d952c3d76378d58fa86fcf
author Xin Li <delphij@google.com> 1572553239 -0700
committer android-build-merger <android-build-merger@google.com> 1572553239 -0700

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

Change-Id: I233006e5cf2a3967308591ba2231a745a0b64a3a