am 1e6f5f04: am c3d0d860: Merge "Make the Phone options dialog use current language"

* commit '1e6f5f0453a2be0553de39c3b6f97da7c66b0b3b':
  Make the Phone options dialog use current language