Merge "d2-common: kernel: faux123 SGH-Krait - jb_cm_exp branch" into jb
diff --git a/default.xml b/default.xml
index a6fc40f..c06396a 100644
--- a/default.xml
+++ b/default.xml
@@ -27,12 +27,16 @@
<project path="dalvik" name="AOKP/platform_dalvik" remote="aokp" revision="jb" />
<project path="development" name="AOKP/platform_development" remote="aokp" revision="jb" />
<project path="device/asus/grouper" name="AOKP/android_device_asus_grouper" remote="aokp" revision="jb" />
+ <project path="device/asus/tf101" name="AOKP/device_asus_tf101" remote="aokp" revision="jb" />
+ <project path="device/asus/tf-common" name="AOKP/device_asus_tf-common" remote="aokp" revision="jb" />
<project path="device/common" name="device/common" remote="aosp" revision="refs/tags/android-4.1.1_r6" />
<project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" remote="aosp" revision="refs/tags/android-4.1.1_r6" />
<project path="device/generic/armv7-a" name="device/generic/armv7-a" remote="aosp" revision="refs/tags/android-4.1.1_r6" />
<project path="device/generic/goldfish" name="device/generic/goldfish" remote="aosp" revision="refs/tags/android-4.1.1_r6" />
<project path="device/google/accessory/arduino" name="device/google/accessory/arduino" remote="aosp" revision="refs/tags/android-4.1.1_r6" />
<project path="device/google/accessory/demokit" name="device/google/accessory/demokit" remote="aosp" revision="refs/tags/android-4.1.1_r6" />
+ <project path="device/htc/evita" name="AOKP/android_device_htc_evita" remote="aokp" revision="jb" />
+ <project path="device/htc/msm8960-common" name="AOKP/android_device_htc_msm8960-common" remote="aokp" revision="jb" />
<project path="device/sample" name="device/sample" remote="aosp" revision="refs/tags/android-4.1.1_r6" />
<project path="device/samsung/aries-common" name="AOKP/device_samsung_aries-common" remote="aokp" revision="jb" />
<project path="device/samsung/captivatemtd" name="AOKP/device_samsung_captivatemtd" remote="aokp" revision="jb" />
@@ -40,13 +44,14 @@
<project path="device/samsung/crespo4g" name="AOKP/device_samsung_crespo4g" remote="aokp" revision="jb" />
<project path="device/samsung/d2-common" name="AOKP/android_device_samsung_d2-common" remote="aokp" revision="jb" />
<project path="device/samsung/d2tmo" name="AOKP/android_device_samsung_d2tmo" remote="aokp" revision="jb" />
+ <project path="device/samsung/d2usc" name="AOKP/device_samsung_d2usc" remote="aokp" revision="jb" />
+ <project path="device/samsung/d2vzw" name="AOKP/device_samsung_d2vzw" remote="aokp" revision="jb" />
<project path="device/samsung/fascinatemtd" name="AOKP/device_samsung_fascinatemtd" remote="aokp" revision="jb" />
<project path="device/samsung/galaxysmtd" name="AOKP/device_samsung_galaxysmtd" remote="aokp" revision="jb" />
<project path="device/samsung/galaxys2-common" name="AOKP/android_device_samsung_galaxys2-common" remote="aokp" revision="jb" />
<project path="device/samsung/i9100" name="AOKP/device_samsung_i9100" remote="aokp" revision="jb" />
<project path="device/samsung/i9100g" name="AOKP/device_samsung_i9100g" remote="aokp" revision="jb" />
<project path="device/samsung/i9300" name="AOKP/device_samsung_i9300" remote="aokp" revision="jb" />
- <project path="device/samsung/d2vzw" name="AOKP/device_samsung_d2vzw" remote="aokp" revision="jb" />
<project path="device/samsung/hercules" name="AOKP/device_samsung_hercules" remote="aokp" revision="jb" />
<project path="device/samsung/n7000" name="AOKP/android_device_samsung_n7000" remote="aokp" revision="jb" />
<project path="device/samsung/maguro" name="AOKP/device_samsung_maguro" remote="aokp" revision="jb" />
@@ -248,7 +253,7 @@
<project path="libnativehelper" name="platform/libnativehelper" remote="aosp" revision="refs/tags/android-4.1.1_r6" />
<project path="ndk" name="platform/ndk" remote="aosp" revision="refs/tags/android-4.1.1_r6" />
<project path="packages/apps/BasicSmsReceiver" name="platform/packages/apps/BasicSmsReceiver" remote="aosp" revision="refs/tags/android-4.1.1_r6" />
- <project path="packages/apps/Bluetooth" name="platform/packages/apps/Bluetooth" remote="aosp" revision="refs/tags/android-4.1.1_r6" />
+ <project path="packages/apps/Bluetooth" name="AOKP/packages_apps_Bluetooth" remote="aokp" revision="jb" />
<project path="packages/apps/Browser" name="AOKP/packages_apps_Browser" remote="aokp" revision="jb" />
<project path="packages/apps/Calculator" name="AOKP/packages_apps_Calculator" remote="aokp" revision="jb" />
<project path="packages/apps/Calendar" name="platform/packages/apps/Calendar" remote="aosp" revision="refs/tags/android-4.1.1_r6" />
@@ -338,6 +343,7 @@
<project path="vendor/aokp" name="AOKP/vendor_aokp" remote="aokp" revision="jb" />
<project path="vendor/aokp/bot" name="AOKP/pseudo_buildbot" remote="aokp" revision="jb" />
+ <project path="vendor/htc" name="AOKP/vendor_htc" remote="aokp" revision="jb" />
<project path="vendor/samsung" name="AOKP/vendor_samsung" remote="aokp" revision="jb" />
<project path="vendor/asus" name="AOKP/vendor_asus" remote="aokp" revision="jb" />
diff --git a/kernel_manifest.xml b/kernel_manifest.xml
index 0b8460e..05eff3b 100644
--- a/kernel_manifest.xml
+++ b/kernel_manifest.xml
@@ -6,5 +6,6 @@
<project path="kernel/samsung/msm8660-common" name="android_kernel_samsung_msm8660-common" remote="cm" revision="jellybean" />
<project path="kernel/samsung/smdk4210" name="android_kernel_samsung_smdk4210" remote="cm" revision="jellybean" />
<project path="kernel/asus/grouper" name="faux123/Nexus-grouper" remote="aokp" revision="jb_exp" />
+ <project path="kernel/asus/tf101" name="AOKP/kernel_asus_tf101" remote="aokp" revision="jb" />
<project path="kernel/samsung/t1" name="android_kernel_samsung_t1" remote="cm" revision="jellybean" />
</manifest>