Use "merge -s ours origin/mirror-partner-mm-wireless-dev" as described in b/26154276
[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