[automerger skipped] Merge "Delete unused timeout constant." into qt-dev
am: f2e3c4f47d -s ours
am skip reason: change_id I5b4c8b42dea515f674ff10d64d0e1d06d849cca1 with SHA1 11aaadd6ae is in history

Change-Id: I24134cdcd55373921b2811c9d4dfc5c4892f4ccb