am ff3a2c18: am c058bf00: Merge "Make the Phone options dialog use current language" into gingerbread

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