tree 3fbdbf01441f219727ba2b8994c08e0fcb1ec1a8
parent 139362517c33f88fed8779e76481be8b767dfe2f
parent a3981e236abded67b0b957e50d1286393c1e806b
author Andy Wickham <awickham@google.com> 1585042405 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1585042405 +0000

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

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

Change-Id: Ic2e89955ad3971c0ef21963aa950f4ae399352da