Merge "Support termination of a call while merge is in process." into mnc-dev
tree: cc4965e30d1626c6dbf4ab7a1dd84f04e137bacd
  1. src/
  2. Android.mk
  3. CleanSpec.mk
  4. README.txt