tree adaff9f3c800a3efbcb5bb89594e8e0fa604bd5b
parent 65166f688ee9faf7bafcef3010ebc449d5faaba2
parent 670efff3891484b7db05d060b1c03d4a98688e40
author Andy Wickham <awickham@google.com> 1585040765 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1585040765 +0000

[automerger skipped] Fixes ag/10573640 on qt-future-dev branch. am: 66dc70c91b -s ours am: 670efff389 -s ours

am skip reason: Change-Id Ib9c85de2f83f99d1ef53fb17fde5d0b3c514849a with SHA-1 ecf9323831 is in history

Change-Id: Ie1ea110f0dc1f3b71878e4cc92f85b558abf8327