Merge "[DO NOT MERGE] Fixing crash related to typing ADN numbers in Dialpad" into ub-contactsdialer-a-dev
am: 614302070c  -s ours

* commit '614302070ca30dd132975d4a79680a00cb62a8cc':
  [DO NOT MERGE] Fixing crash related to typing ADN numbers in Dialpad
tree: 1527a65ba849ba6102ebf24f88e61cd1877a6714
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags