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

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