tree 3fbdbf01441f219727ba2b8994c08e0fcb1ec1a8
parent 344739ae2f09a846a182ade31adc7629148c9dcf
parent 50f6b92d4c9fc97858ce60919817183c824387cc
author Andy Wickham <awickham@google.com> 1585043791 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1585043791 +0000

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

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

Change-Id: Iaec97494665b2ee956f39d113bf49c3e64de27e6