tree 3fbdbf01441f219727ba2b8994c08e0fcb1ec1a8
parent 02c3d0ee40cbb993e88004d5192212117f373e0d
parent bf72002d2867f5afade4c388f70f537380cb2a7c
author Andy Wickham <awickham@google.com> 1585042395 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1585042395 +0000

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

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

Change-Id: I5337b168006d3fc52d79e0da2369badde3528033