[automerger skipped] Merge "Fix nit in LocaleDataTest#testInvalidLocale and StringTest#testFormat_invalidLocale" into qt-dev
am: de64a196b5 -s ours
am skip reason: change_id If2d1c88705ab6a8e3cc855f6a957ffc33641dc84 with SHA1 4545804aad is in history

Change-Id: I8b280bce7551e08d9b261deaa675360f0c46ca7c