Merge "Restore the phone disambiguation dialog" into klp-dev
tree: 539db4529047677a6dc7a6c4391fe98b530ede46
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags