tree c59b7d18b0f5c5194a8e2d5ff24920f8c278f238
parent fdb57148be75def2fd8993d59addfc68c669c28d
parent 0666054d606adcd397fa15730bad4908b1731e19
author Xin Li <delphij@google.com> 1572469088 -0700
committer android-build-merger <android-build-merger@google.com> 1572469088 -0700

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

Change-Id: I4dd0dae3b5e0c3c98a8f0fa106c25a435ad296cc