tree 0835de12c1ead9541cc311c005445af19bba0f24
parent 8e77fe07bbf201b954b6b2a6bb37938def3137f9
parent 85b34590adadd6981d293721d74d2f7c57739b3c
author Xin Li <delphij@google.com> 1586492025 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586492025 +0000

[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 976d18eee9 -s ours am: 1faa5d4d65 am: 8a7df8b873 am: 85b34590ad -s ours

am skip reason: subject contains skip directive

Change-Id: Ic9a8a664592d7a77ee943abc0a0e3ff4dbef4557