Add a CAF-IMS RRO, to be enabled based on property
diff --git a/CAF-IMS/Android.mk b/CAF-IMS/Android.mk
new file mode 100644
index 0000000..f0b062c
--- /dev/null
+++ b/CAF-IMS/Android.mk
@@ -0,0 +1,8 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_PACKAGE_NAME := treble-overlay-caf-ims
+LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
+LOCAL_PRIVATE_PLATFORM_APIS := true
+include $(BUILD_PACKAGE)
diff --git a/CAF-IMS/AndroidManifest.xml b/CAF-IMS/AndroidManifest.xml
new file mode 100644
index 0000000..47236c6
--- /dev/null
+++ b/CAF-IMS/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="me.phh.treble.overlay.cafims"
+        android:versionCode="1"
+        android:versionName="1.0">
+        <overlay android:targetPackage="android"
+                android:requiredSystemPropertyName="persist.sys.phh.ims.caf"
+                android:requiredSystemPropertyValue="true"
+		android:priority="39"
+		android:isStatic="true" />
+</manifest>
diff --git a/CAF-IMS/res/values/config.xml b/CAF-IMS/res/values/config.xml
new file mode 100644
index 0000000..0205984
--- /dev/null
+++ b/CAF-IMS/res/values/config.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string name="config_ims_package">org.codeaurora.ims</string>
+	<bool name="config_dynamic_bind_ims">true</bool>
+</resources>
diff --git a/overlay.mk b/overlay.mk
index 7ee7e44..28732e5 100644
--- a/overlay.mk
+++ b/overlay.mk
@@ -1,6 +1,7 @@
 PRODUCT_PACKAGES += \
 	treble-overlay-asus-zenfone5 \
 	treble-overlay-asus-zenfone5z \
+	treble-overlay-caf-ims \
 	treble-overlay-huawei \
 	treble-overlay-huawei-DUK \
 	treble-overlay-huawei-STF \