Merge "Fix bug with null pointer exception with conference call"
tree: 545d8f0956b80ede31fabbb91337a275fe03d32c
  1. libs/
  2. res/
  3. src/
  4. tests/
  5. .classpath
  6. .project
  7. Android.mk
  8. AndroidManifest.xml