tree 3fbdbf01441f219727ba2b8994c08e0fcb1ec1a8
parent c81d9e49805d46c891140806319404ba9043e713
parent 670efff3891484b7db05d060b1c03d4a98688e40
author Andy Wickham <awickham@google.com> 1585040768 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1585040768 +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: I8d3dd36cdb0511ec79f9d818631c48c0f6c11dd2