[automerger skipped] Merge "Fix Sms7BitEncodingTranslatorTest to build" into...
[automerger skipped] Merge "Fix Sms7BitEncodingTranslatorTest to build" into qt-dev am: 4e451042 am: b47bfbfe -s ours
am: 6c65d1e3 -s ours
am skip reason: change_id Idaa0ef12da7c07dbd2808a914d714f96a89b2319 with SHA1 46131ee6 is in history
Change-Id: Ia73d8b4063b1c3f86c0c3f93354e7e627647fabb