[automerger skipped] Merge "Fix overflow/dos in 3gg text description parsing"...
[automerger skipped] Merge "Fix overflow/dos in 3gg text description parsing" into qt-dev am: 2ffe8ab8 -s ours
am: 8bd5476d -s ours
am skip reason: change_id I8765ac9746c3de7d711ef866d4ec0e29972320c0 with SHA1 851e22d1 is in history
Change-Id: Ida42d0858e8ca9a7cb4b0cbcac76891dee91481c