mirror of
				https://github.com/LineageOS/android.git
				synced 2025-11-03 23:07:01 -05:00 
			
		
		
		
	Merge branch 'ics' of git://github.com/CyanogenMod/android into ics
This commit is contained in:
		
						commit
						afe77cc827
					
				@ -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" />
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user