Merge "IMS conference merge improvements." into oc-dev
[android/platform/frameworks/opt/telephony.git] /
-rw-r--r-- Android.mk
-rw-r--r-- CleanSpec.mk
-rw-r--r-- PREUPLOAD.cfg
-rw-r--r-- README.txt
-rw-r--r-- jarjar-rules.txt
drwxr-xr-x proto
drwxr-xr-x src
drwxr-xr-x tests
drwxr-xr-x tools