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
tree: f2e7e199130d1d9bea9bcd7f8d76f3d8d627282a
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE