tree 2d29ccd895e25e03eab083732f2618703e8b91da
parent 4ab54ec2f7d77edc2028d9d1ee4fcc9e663389d7
parent d968f23fb2add5450ef773317bc0467fbd267f43
author Xin Li <delphij@google.com> 1572473526 -0700
committer android-build-merger <android-build-merger@google.com> 1572473526 -0700

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

Change-Id: I0c5609855d2b5309725ed27666a1f4ea1f377929