commit afe77cc82742813b097704969ec32f15df7daa74
author Koushik Dutta <koushd@gmail.com> Sun Nov 20 21:00:51 2011 -0800
committer Koushik Dutta <koushd@gmail.com> Sun Nov 20 21:00:51 2011 -0800
tree b89f7d1da0f0d596210c276602194bdad5b4746a
parent 7f0a0d2a488851b2bda1b74a8f2edbd3b6b596c3
parent 469d9f0cd34df52afad5e73107021400f92624bc

Merge branch 'ics' of git://github.com/CyanogenMod/android into ics

default.xml

diff --git a/default.xml b/default.xml
index eb87a8e..2d90ad2 100644
--- a/default.xml
+++ b/default.xml
@@ -151,7 +151,7 @@
   <project path="frameworks/base" name="CyanogenMod/android_frameworks_base" />
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" remote="aosp" revision="refs/tags/android-4.0.1_r1" />
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" remote="aosp" revision="refs/tags/android-4.0.1_r1" />
-  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" remote="aosp" revision="refs/tags/android-4.0.1_r1" />
+  <project path="frameworks/compile/slang" name="CyanogenMod/android_frameworks_compile_slang" />
   <project path="frameworks/ex" name="CyanogenMod/android_frameworks_ex" />
   <project path="frameworks/media/libvideoeditor" name="platform/frameworks/media/libvideoeditor" remote="aosp" revision="refs/tags/android-4.0.1_r1" />
   <project path="frameworks/opt/calendar" name="platform/frameworks/opt/calendar" remote="aosp" revision="refs/tags/android-4.0.1_r1" />