am 69da1fe8: am feafc202: am fe225e25: Merge change I70e1f7a6 into eclair

Merge commit '69da1fe8b868437c5b3e6e4fcf07e7dc7793201d'

* commit '69da1fe8b868437c5b3e6e4fcf07e7dc7793201d':
  Fix the selection of locale from SIM mcc.