Merge "Added a dialog to confirm caller id reporting (1/2)." into lmp-dev
tree: 6e1e0439c101bc169d90897dec04de2e8a118958
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags