Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/jellybean' into jellybean
Browse files Browse the repository at this point in the history
  • Loading branch information
@busches
busches committed Sep 12, 2012
2 parents 596cce3 + bfa7083 commit 5b533fa
Showing 1 changed file with 19 additions and 19 deletions.
38 changes: 19 additions & 19 deletions default.xml
View file
Expand Up @@ -292,27 +292,27 @@
<project path="packages/wallpapers/NoiseField" name="CyanogenMod/android_packages_wallpapers_NoiseField" />
<project path="packages/wallpapers/PhaseBeam" name="CyanogenMod/android_packages_wallpapers_PhaseBeam" />
<project path="pdk" name="CyanogenMod/android_pdk" />
<project path="prebuilt" name="CyanogenMod/android_prebuilt" />
<project path="prebuilts/eclipse" name="CyanogenMod/android_prebuilts_eclipse" />
<project path="prebuilt" name="platform/prebuilt" remote="aosp" revision="jb-dev" />
<project path="prebuilts/eclipse" name="platform/prebuilts/eclipse" remote="aosp" revision="jb-dev" />
<project path="prebuilts/gcc/darwin-x86/arm/arm-eabi-4.6" name="CyanogenMod/android_prebuilts_gcc_darwin-x86_arm_arm-eabi-4.6" />
<project path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.6" name="CyanogenMod/android_prebuilts_gcc_darwin-x86_arm_arm-linux-androideabi-4.6" />
<project path="prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.4.3" name="CyanogenMod/android_prebuilts_gcc_darwin-x86_mips_mipsel-linux-android-4.4.3" />
<project path="prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.6" name="CyanogenMod/android_prebuilts_gcc_darwin-x86_mips_mipsel-linux-android-4.6" />
<project path="prebuilts/gcc/darwin-x86/x86/i686-android-linux-4.4.3" name="CyanogenMod/android_prebuilts_gcc_darwin-x86_x86_i686-android-linux-4.4.3" />
<project path="prebuilts/gcc/darwin-x86/x86/i686-linux-android-4.6" name="CyanogenMod/android_prebuilts_gcc_darwin-x86_x86_i686-linux-android-4.6" />
<project path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.6" name="CyanogenMod/android_prebuilts_gcc_linux-x86_arm_arm-eabi-4.6" />
<project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.6" name="CyanogenMod/android_prebuilts_gcc_linux-x86_arm_arm-linux-androideabi-4.6" />
<project path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.4.3" name="CyanogenMod/android_prebuilts_gcc_linux-x86_host_i686-linux-glibc2.7-4.4.3" />
<project path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" name="CyanogenMod/android_prebuilts_gcc_linux-x86_host_i686-linux-glibc2.7-4.6" />
<project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" name="CyanogenMod/android_prebuilts_gcc_linux-x86_host_x86_64-linux-glibc2.7-4.6" />
<project path="prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.4.3" name="CyanogenMod/android_prebuilts_gcc_linux-x86_mips_mipsel-linux-android-4.4.3" />
<project path="prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.6" name="CyanogenMod/android_prebuilts_gcc_linux-x86_mips_mipsel-linux-android-4.6" />
<project path="prebuilts/gcc/linux-x86/x86/i686-android-linux-4.4.3" name="CyanogenMod/android_prebuilts_gcc_linux-x86_x86_i686-android-linux-4.4.3" />
<project path="prebuilts/gcc/linux-x86/x86/i686-linux-android-4.6" name="CyanogenMod/android_prebuilts_gcc_linux-x86_x86_i686-linux-android-4.6" />
<project path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.6" name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.6" remote="aosp" revision="jb-dev" />
<project path="prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.4.3" name="platform/prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.4.3" remote="aosp" revision="jb-dev" />
<project path="prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.6" name="platform/prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.6" remote="aosp" revision="jb-dev" />
<project path="prebuilts/gcc/darwin-x86/x86/i686-android-linux-4.4.3" name="platform/prebuilts/gcc/darwin-x86/x86/i686-android-linux-4.4.3" remote="aosp" revision="jb-dev" />
<project path="prebuilts/gcc/darwin-x86/x86/i686-linux-android-4.6" name="platform/prebuilts/gcc/darwin-x86/x86/i686-linux-android-4.6" remote="aosp" revision="jb-dev" />
<project path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.6" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.6" remote="aosp" revision="jb-dev" />
<project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.6" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.6" remote="aosp" revision="jb-dev" />
<project path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.4.3" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.4.3" remote="aosp" revision="jb-dev" />
<project path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" remote="aosp" revision="jb-dev" />
<project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" remote="aosp" revision="jb-dev" />
<project path="prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.4.3" name="platform/prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.4.3" remote="aosp" revision="jb-dev" />
<project path="prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.6" name="platform/prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.6" remote="aosp" revision="jb-dev" />
<project path="prebuilts/gcc/linux-x86/x86/i686-android-linux-4.4.3" name="platform/prebuilts/gcc/linux-x86/x86/i686-android-linux-4.4.3" remote="aosp" revision="jb-dev" />
<project path="prebuilts/gcc/linux-x86/x86/i686-linux-android-4.6" name="platform/prebuilts/gcc/linux-x86/x86/i686-linux-android-4.6" remote="aosp" revision="jb-dev" />
<project path="prebuilts/misc" name="CyanogenMod/android_prebuilts_misc" />
<project path="prebuilts/ndk" name="CyanogenMod/android_prebuilts_ndk" />
<project path="prebuilts/qemu-kernel" name="CyanogenMod/android_prebuilts_qemu-kernel" />
<project path="prebuilts/sdk" name="CyanogenMod/android_prebuilts_sdk" />
<project path="prebuilts/ndk" name="platform/prebuilts/ndk" remote="aosp" revision="jb-dev" />
<project path="prebuilts/qemu-kernel" name="platform/prebuilts/qemu-kernel" remote="aosp" revision="jb-dev" />
<project path="prebuilts/sdk" name="platform/prebuilts/sdk" remote="aosp" revision="jb-dev" />
<project path="prebuilts/tools" name="CyanogenMod/android_prebuilts_tools" />
<project path="sdk" name="CyanogenMod/android_sdk" />
<project path="system/bluetooth" name="CyanogenMod/android_system_bluetooth" />
Expand Down

0 comments on commit 5b533fa

Please sign in to comment.