Merge "Fix bubble for conference call."
tree: ec729d0cc41ce64a298f3b0d8aa9cea36d161504
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. LICENSE