Merge "Fix potential NPE in ImsCall notifyConferenceStateUpdated." into mnc-dr-dev
tree: bf8f02c7964aad35a64f289c1c5052681b0b6bfb
  1. src/
  2. Android.mk
  3. CleanSpec.mk
  4. README.txt