tree dc27fbe0418e9a3fd5a2a1de6d15c7b5b5500be5
parent 5d87e9a1ae31f9c7967a5a02eb54b72a8e67ffde
parent 12ca8b940da6c989fd47bdf7d1fbbd05bec2acec
author Andy Wickham <awickham@google.com> 1585028274 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1585028274 +0000

[automerger skipped] Fixes ag/10573640 on qt-future-dev branch. am: 12ca8b940d -s ours

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

Change-Id: Iab3d186b124796b3f6d2758654dad9c996180a09