tree 56d1947e247e124556896a7c0669f84df8d63fbd
parent 069ed88c6517671a9dcb53901f40832d84f84c11
parent c2884a2851ff96ec96ce37f10653c5bf2c28f6ff
author Xin Li <delphij@google.com> 1586494456 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586494456 +0000

[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: c58c13d198 -s ours am: ee04b09c8f am: 7e02308435 am: c2884a2851 -s ours

am skip reason: subject contains skip directive

Change-Id: I71c74e79a4e791991201d1d12edf223618187d07