tree adaff9f3c800a3efbcb5bb89594e8e0fa604bd5b
parent b021e7d3e515302e93bdd057987dd55885eaa0ee
parent 344739ae2f09a846a182ade31adc7629148c9dcf
author Andy Wickham <awickham@google.com> 1585045179 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1585045179 +0000

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

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

Change-Id: I7aabbb2c414a2efe037541142029cbb5193d7a8d