[automerger skipped] Merge "Force FGS notifications to show for a minimum time" into qt-dev am: e590a7d0b5 am: 9ec959b8f3 -s ours
am:a2ba1ccfdc-s ours am skip reason: change_id I0680034ed9315aa2c05282524d48faaed066ebd0 with SHA15136eefeb3is in history Change-Id: Ibdd94e1e6425403022f04f2a7b91c6f1dba2b74e
This commit is contained in: