tree e3d2ceadfd465d7a5381f4e1e52270e5da4ea1ca
parent bc5ee3acdc002cb972d998d3ac264a3110d0ed99
parent e892a62257eb19888144f842fd03eb70ccabe8bb
author Xin Li <delphij@google.com> 1572470604 -0700
committer android-build-merger <android-build-merger@google.com> 1572470604 -0700

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

Change-Id: I67931cb64b93ee9af0fad6373cb39b4aa78afaa5