am 0f65b5aa: am dffa10ea: am 6fc974f2: Merge "String updates for general dialer settings." into lmp-dev

* commit '0f65b5aad1ed3909f08f8c57193e9a6761398f9c':
  String updates for general dialer settings.
tree: 1ead33ba2e543c1115be94a18a2dc1f3ddfb87d3
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags