Merge "Prevent merging conference calls hosted on peer device." into lmp-mr1-wfc-dev
[android/platform/frameworks/opt/net/ims.git] /
-rw-r--r-- Android.mk
-rw-r--r-- CleanSpec.mk
-rw-r--r-- README.txt
drwxr-xr-x src