tree 30be407cb308e747a4af261ea044e9b4251eadfe
parent 802013d73be145a58d47ae6f98fb59976d9d2eef
parent f2e3c4f47dc80192c7c657da14353d5f0e231dff
author Lorenzo Colitti <lorenzo@google.com> 1556139640 -0700
committer android-build-merger <android-build-merger@google.com> 1556139640 -0700

[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