Merge "Use mInCallActivity if mContext is null." into lmp-mr1-dev
tree: 20b09619824b3e3217685ca30fb0dfb643d7befa
  1. res/
  2. src/
  3. proguard.flags