am 001310f2: Merge "Restore the phone disambiguation dialog" into klp-dev

* commit '001310f2e6dc7f00b6c41d9f77db3df0a72090e5':
  Restore the phone disambiguation dialog
tree: b4c3422e989bbf5f4c99cb4ebb927d8ee9a55203
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags