From acc0966147db8f828dd43ce91f0657847beb636f Mon Sep 17 00:00:00 2001
From: Chirayu Desai <cdesai@cyanogenmod.org>
Date: Fri, 15 Aug 2014 19:33:09 +0530
Subject: [PATCH 1/2] copy vendor/cm/bootimage/Android.mk to kernel/

Change-Id: I62dd0f89403dc032dd8d6359cee702b7ba58e87e
---
 default.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/default.xml b/default.xml
index 76333b96..f7143f1c 100644
--- a/default.xml
+++ b/default.xml
@@ -496,6 +496,8 @@
   <project path="tools/idea" name="platform/tools/idea" groups="notdefault,tools" remote="aosp" revision="refs/tags/android-4.4.4_r2" />
   <project path="tools/studio/cloud" name="platform/tools/studio/cloud" groups="notdefault,tools" remote="aosp" revision="refs/tags/android-4.4.4_r2" />
   <project path="tools/swt" name="platform/tools/swt" groups="notdefault,tools" remote="aosp" revision="refs/tags/android-4.4.4_r2" />
-  <project path="vendor/cm" name="CyanogenMod/android_vendor_cm" />
+  <project path="vendor/cm" name="CyanogenMod/android_vendor_cm" >
+    <copyfile src="bootimage/Android.mk" dest="kernel/Android.mk" />
+  </project>
   <project path="vendor/cyngn" name="cyngn/android_vendor_cyngn" />
 </manifest>

From 1cd33ec65d3fd88effbb714b9e84295cc7209554 Mon Sep 17 00:00:00 2001
From: cretin45 <cretin45@gmail.com>
Date: Thu, 6 Nov 2014 12:37:22 -0800
Subject: [PATCH 2/2] Use Mms-caf for Mms

Change-Id: I902f3d3bc552381e3e954dce651a9f43ff4cfd6c
---
 default.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.xml b/default.xml
index f7143f1c..c90feb27 100644
--- a/default.xml
+++ b/default.xml
@@ -386,7 +386,7 @@
   <project path="packages/apps/InCallUI" name="CyanogenMod/android_packages_apps_InCallUI" />
   <project path="packages/apps/KeyChain" name="CyanogenMod/android_packages_apps_KeyChain" />
   <project path="packages/apps/LockClock" name="CyanogenMod/android_packages_apps_LockClock" />
-  <project path="packages/apps/Mms" name="CyanogenMod/android_packages_apps_Mms" />
+  <project path="packages/apps/Mms" name="CyanogenMod/android_packages_apps_Mms-caf" />
   <project path="packages/apps/Nfc" name="CyanogenMod/android_packages_apps_Nfc" />
   <project path="packages/apps/OneTimeInitializer" name="platform/packages/apps/OneTimeInitializer" remote="aosp" revision="refs/tags/android-4.4.4_r2" />
   <project path="packages/apps/PackageInstaller" name="CyanogenMod/android_packages_apps_PackageInstaller" />