tree 81da1f54e004be1abc6409d8b07712c3c069c2ca
parent afd79b23432bd9406818518fa2b0e19433cea0dd
parent 259716d744224d0b01e1604c84e22294788ad95d
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1581370818 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1581370818 +0000

resolve merge conflicts of 13758371cc4a2b3dce0b932f0567986b41d7f13e to qt-qpr1-dev am: 3e7e66caa4 am: 259716d744

Change-Id: I89bc634628b04390680e93c3869581aeec51e12a