Merge "Prevent merging conference calls hosted on peer device." into lmp-mr1-wfc-dev
tree: ed2ae8250a8c39f5af3ddef56428f6eddc6e9866
  1. Android.mk
  2. CleanSpec.mk
  3. README.txt
  4. src/