tree 0f24221c9dd55b52a7ab482f7582d1401b29af9b
parent 9939703f002713ee9c7d60e383ddb9946d557955
parent 3fa4ca8d5017a7b0d38283607fa7ae110eca13a4
author Xin Li <delphij@google.com> 1572470698 -0700
committer android-build-merger <android-build-merger@google.com> 1572470698 -0700

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

Change-Id: I5fb1b0efa7dca61b4a5bc200ac793dc8763b85b1