tree 188df979a65f5480cf9ad22b6890b9c8e3484466
parent 08f14b537f16200bafa9d702cc4997cb87e9f331
parent 2ac163eef3e0000a5c9990e3d2d64a0a9e30c113
author Xin Li <delphij@google.com> 1572469082 -0700
committer android-build-merger <android-build-merger@google.com> 1572469082 -0700

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

Change-Id: I77c93837447c0fed90d9d13e1676f76c86941647