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

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