Merge remote-tracking branch 'github/cm-11.0' into HEAD

This commit is contained in:
Brint E. Kriebel 2014-04-11 14:35:11 -07:00
commit 0a26843dc0

View File

@ -64,6 +64,7 @@
<project path="external/bluetooth/bluedroid" name="CyanogenMod/android_external_bluetooth_bluedroid" groups="pdk" />
<project path="external/bouncycastle" name="CyanogenMod/android_external_bouncycastle" />
<project path="external/bsdiff" name="CyanogenMod/android_external_bsdiff" groups="pdk" />
<project path="external/bson" name="CyanogenMod/android_external_bson" />
<project path="external/busybox" name="CyanogenMod/android_external_busybox" />
<project path="external/bzip2" name="CyanogenMod/android_external_bzip2" groups="pdk" />
<project path="external/ceres-solver" name="platform/external/ceres-solver" remote="aosp" revision="refs/tags/android-4.4.2_r2" />
@ -84,7 +85,7 @@
<project path="external/chromium_org/third_party/libphonenumber/src/phonenumbers" name="platform/external/chromium_org/third_party/libphonenumber/src/phonenumbers" remote="aosp" revision="refs/tags/android-4.4.2_r2" />
<project path="external/chromium_org/third_party/libphonenumber/src/resources" name="platform/external/chromium_org/third_party/libphonenumber/src/resources" remote="aosp" revision="refs/tags/android-4.4.2_r2" />
<project path="external/chromium_org/third_party/mesa/src" name="platform/external/chromium_org/third_party/mesa/src" remote="aosp" revision="refs/tags/android-4.4.2_r2" />
<project path="external/chromium_org/third_party/openssl" name="platform/external/chromium_org/third_party/openssl" remote="aosp" revision="refs/tags/android-4.4.2_r2" />
<project path="external/chromium_org/third_party/openssl" name="CyanogenMod/android_external_chromium_org_third_party_openssl" />
<project path="external/chromium_org/third_party/opus/src" name="platform/external/chromium_org/third_party/opus/src" remote="aosp" revision="refs/tags/android-4.4.2_r2" />
<project path="external/chromium_org/third_party/ots" name="platform/external/chromium_org/third_party/ots" remote="aosp" revision="refs/tags/android-4.4.2_r2" />
<project path="external/chromium_org/third_party/skia/gyp" name="platform/external/chromium_org/third_party/skia/gyp" remote="aosp" revision="refs/tags/android-4.4.2_r2" />
@ -99,6 +100,7 @@
<project path="external/compiler-rt" name="CyanogenMod/android_external_compiler-rt" groups="pdk" />
<project path="external/connectivity" name="CyanogenMod/android_external_connectivity" />
<project path="external/crda" name="CyanogenMod/android_external_crda" />
<project path="external/curl" name="CyanogenMod/android_external_curl" />
<project path="external/dexmaker" name="CyanogenMod/android_external_dexmaker" />
<project path="external/dhcpcd" name="CyanogenMod/android_external_dhcpcd" />
<project path="external/dnsmasq" name="CyanogenMod/android_external_dnsmasq" groups="pdk" />
@ -225,6 +227,7 @@
<project path="external/ppp" name="CyanogenMod/android_external_ppp" />
<project path="external/proguard" name="CyanogenMod/android_external_proguard" groups="pdk-java" />
<project path="external/protobuf" name="CyanogenMod/android_external_protobuf" groups="pdk" />
<project path="external/protobuf-c" name="CyanogenMod/android_external_protobuf-c" />
<project path="external/qemu" name="CyanogenMod/android_external_qemu" />
<project path="external/qemu-pc-bios" name="CyanogenMod/android_external_qemu-pc-bios" />
<project path="external/qrngd" name="CyanogenMod/android_external_qrngd" />
@ -359,7 +362,6 @@
<project path="packages/apps/HTMLViewer" name="CyanogenMod/android_packages_apps_HTMLViewer" />
<project path="packages/apps/InCallUI" name="CyanogenMod/android_packages_apps_InCallUI" />
<project path="packages/apps/KeyChain" name="CyanogenMod/android_packages_apps_KeyChain" />
<project path="packages/apps/Launcher3" name="CyanogenMod/android_packages_apps_Launcher3" />
<project path="packages/apps/LockClock" name="CyanogenMod/android_packages_apps_LockClock" />
<project path="packages/apps/Mms" name="CyanogenMod/android_packages_apps_Mms" />
<project path="packages/apps/Nfc" name="CyanogenMod/android_packages_apps_Nfc" />
@ -367,7 +369,6 @@
<project path="packages/apps/PackageInstaller" name="CyanogenMod/android_packages_apps_PackageInstaller" />
<project path="packages/apps/PhoneCommon" name="CyanogenMod/android_packages_apps_PhoneCommon" />
<project path="packages/apps/Provision" name="CyanogenMod/android_packages_apps_Provision" />
<project path="packages/apps/QuickSearchBox" name="CyanogenMod/android_packages_apps_QuickSearchBox" />
<project path="packages/apps/Settings" name="CyanogenMod/android_packages_apps_Settings" />
<project path="packages/apps/SmartCardService" name="CyanogenMod/android_packages_apps_SmartCardService" />
<project path="packages/apps/SoundRecorder" name="CyanogenMod/android_packages_apps_SoundRecorder" />