tree 1c981acbc652e038f2b354232c839b2c6865b31f
parent 42ea9e1fdd4d264c9edaf4e3867df7a9f7bd193e
author Narayan Kamath <narayan@google.com> 1438167848 +0100
committer Narayan Kamath <narayan@google.com> 1438250933 +0000

Fix language settings for Canada.

Adjusts behaviour after commit 04787851cbd97. We pass in the language
from the SimRecords (from EF-PL, EF-LI) to the MccTable language
matching code. This fixes pathological cases like sim language
= "fr" for canada, where we return "fr-US" instead of "fr-CA".

♫♫
Well, blame Canada, blame Canada
It seems that everything's gone wrong
Since Canada came along
♫♫

bug: 22684963
Change-Id: Ib72dc4fbdf864897c194836219b8ffaf14fc2152