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

This commit is contained in:
Koushik Dutta 2011-11-20 21:00:51 -08:00
commit afe77cc827

View File

@ -151,7 +151,7 @@
<project path="frameworks/base" name="CyanogenMod/android_frameworks_base" /> <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/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/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/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/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" /> <project path="frameworks/opt/calendar" name="platform/frameworks/opt/calendar" remote="aosp" revision="refs/tags/android-4.0.1_r1" />