Merge "Fix crash on incoming video call when video upgrade call is pending."
tree: 9aed27cb8ebacbcf24cbc6bd8b9d12a58de94cc6
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. CONTRIBUTING
  6. LICENSE