tree 0832b1592aa8200e0d8b30639bfea5813030a20d
parent c353a645aa71fbaca461df813b1b9c0347391c14
parent ecc2406087855bedf2d8e8e528ab0b2b4e6c7298
author Xin Li <delphij@google.com> 1572476701 -0700
committer android-build-merger <android-build-merger@google.com> 1572476701 -0700

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

Change-Id: Ic32c2fcd2d8bd4d820fcf8c39396fc09a61d0764