am ae9815fc: Merge "Switch convertAndStrip to normalizeNumber"

* commit 'ae9815fcd95c27a45b94df0e305ccd8b96410aff':
  Switch convertAndStrip to normalizeNumber
tree: 6926fba9ef06f72e6d9faa55ce341b65620ed41b
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags