Merge branch 'cm-11.0' into stable/cm-11.0

This commit is contained in:
Brint E. Kriebel 2014-12-23 15:27:50 -08:00
commit 8a531fe0fb

View File

@ -386,7 +386,7 @@
<project path="packages/apps/InCallUI" name="CyanogenMod/android_packages_apps_InCallUI" /> <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/KeyChain" name="CyanogenMod/android_packages_apps_KeyChain" />
<project path="packages/apps/LockClock" name="CyanogenMod/android_packages_apps_LockClock" /> <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/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/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" /> <project path="packages/apps/PackageInstaller" name="CyanogenMod/android_packages_apps_PackageInstaller" />
@ -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/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/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="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" /> <project path="vendor/cyngn" name="cyngn/android_vendor_cyngn" />
</manifest> </manifest>