tree 0f638124f3689022c99d8c464002eb34755af309
parent be000ac620aad34aaba67497c4fe4324508d8394
parent 21570b8f71e3cf7f1597b30e87dc1e58196306c5
author Xin Li <delphij@google.com> 1572470589 -0700
committer android-build-merger <android-build-merger@google.com> 1572470589 -0700

[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: dae345f495
am: 21570b8f71 -s ours
am skip reason: subject contains skip directive

Change-Id: I613e3cfab0ec2391100c4cc8897160ce453fb9df