[automerger skipped] Merge "Use language tags to store Configuration's locale list." into qt-dev am: 6dfa267f91 am: 6947f255e4 am: 019d50c70b
am: 22be6dd08b -s ours
am skip reason: change_id I53946ed4e31de0ffe9c84875c391a7dec6f5375a with SHA1 bd0ce4d42f is in history

Change-Id: I51bab88358a50bd7b391633b1c3982e8e5948136