tree 07eedfdeb30dec2db876f0692fe202399de8a15c
parent d9c1b1015d0489b9d3163030594ffcd5d3c63e2a
author Tony Hill <wth017@motorola.com> 1435154038 +0100
committer Narayan Kamath <narayan@google.com> 1435753038 +0100

Allow the SIM country code to supplement the SIM language

The SIM language preferences take priority - but they only store
a language (e.g. fr = French), not an exact locale
(e.g. fr_FR = French/France).
So, the SIM MCC is used as a supplement to provide an exact locale.

Bug: 22054390
Bug: 21942138

(cherry picked from commit 581ed0704ebaba7043b112d1e39acc7bf1c8d498)

Change-Id: I87a3c1dd12832ac73fdafefefbb3281ad1bc7321