tree a30ca9228eecaeb7d346eac41ad6f97780528c57
parent 2092bc00815a98b5aa5688e659e958f258c6e0cd
parent c7ce7324e34c37f10d68563eaf28057185ae4487
author Xin Li <delphij@google.com> 1572476580 -0700
committer android-build-merger <android-build-merger@google.com> 1572476580 -0700

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

Change-Id: I9995e31f1eec5762409024f4441cb8009332c77a