tree 2afe57286f595aa9fac8ca0f0e5e67594ce35fb6
parent 86fdfe91de274204c9cabffee9d6324381257cad
parent 5ffbe665ddef57754d34bc5f9bd691b9be61d524
author Xin Li <delphij@google.com> 1586491434 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586491434 +0000

[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 7bc65fcf0a -s ours am: b985ec96a9 am: f4ac534484 am: 5ffbe665dd -s ours

am skip reason: subject contains skip directive

Change-Id: I779acd83b06ae1455d0e459e0f04a56d534fe784