Merge "Fix for call switching." into lmp-dev
tree: 2a1f513894532f7712fbc39f588bc1402dcca5a0
  1. libs/
  2. res/
  3. src/
  4. tests/
  5. .classpath
  6. .project
  7. Android.mk
  8. AndroidManifest.xml