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

Change-Id: I258d9fed5f809aa9c2f0d9226b0d46c4c2f7bcb2