cm.xml: update to android-6.0.1_r31

diff --git a/cm.xml b/cm.xml
index 18a289d..a210a89 100644 (file)
--- a/cm.xml
+++ b/cm.xml
@@ -4,7 +4,7 @@
   <remote  name="aosp"
            fetch="https://android.googlesource.com"
            review="android-review.googlesource.com"
-           revision="refs/tags/android-6.0.1_r22" />
+           revision="refs/tags/android-6.0.1_r31" />
 
   <remote  name="cm"
            fetch="https://github.com/CyanogenMod"
@@ -93,6 +93,7 @@
   <project path="external/curl" name="android_external_curl" />
   <project path="external/dhcpcd" name="android_external_dhcpcd" groups="pdk-cw-fs,pdk-fs" />
   <project path="external/dnsmasq" name="android_external_dnsmasq" groups="pdk" />
+  <project path="external/doclava" name="android_external_doclava" groups="pdk-cw-fs,pdk-fs" />
   <project path="external/e2fsprogs" name="android_external_e2fsprogs" groups="pdk" />
   <project path="external/ebtables" name="android_external_ebtables" />
   <project path="external/elfutils" name="android_external_elfutils" groups="pdk" />
@@ -105,12 +106,14 @@
   <project path="external/google" name="android_external_google" />
   <project path="external/gmock" name="android_external_gmock"/>
   <project path="external/gson" name="android_external_gson" />
+  <project path="external/guava" name="android_external_guava" groups="pdk-cw-fs,pdk-fs" />
   <project path="external/htop" name="android_external_htop" />
   <project path="external/icu" name="android_external_icu" groups="pdk" />
   <project path="external/iproute2" name="android_external_iproute2" groups="pdk" />
   <project path="external/iptables" name="android_external_iptables" groups="pdk-cw-fs,pdk-fs" />
   <project path="external/jarjar" name="android_external_jarjar" groups="pdk" />
   <project path="external/jpeg" name="android_external_jpeg" groups="pdk" />
+  <project path="external/json-c" name="android_external_json-c" />
   <project path="external/jsr305" name="android_external_jsr305" groups="pdk-cw-fs,pdk-fs" />
   <project path="external/koush/AndroidAsync" name="AndroidAsync" />
   <project path="external/koush/ion" name="ion" />
@@ -163,6 +166,7 @@
   <project path="external/unrar" name="android_external_unrar" />
   <project path="external/unzip" name="android_external_unzip" />
   <project path="external/vim" name="android_external_vim" />
+  <project path="external/vogar" name="android_external_vogar" groups="pdk" />
   <project path="external/wpa_supplicant_8" name="android_external_wpa_supplicant_8" groups="pdk" />
   <project path="external/yaffs2" name="android_external_yaffs2" groups="pdk" />
   <project path="external/zip" name="android_external_zip" />
@@ -312,9 +316,11 @@
   <project path="packages/providers/ThemesProvider" name="android_packages_providers_ThemesProvider" />
   <project path="packages/providers/TvProvider" name="android_packages_providers_TvProvider" groups="pdk-fs" />
   <project path="packages/providers/UserDictionaryProvider" name="android_packages_providers_UserDictionaryProvider" groups="pdk-cw-fs,pdk-fs" />
+  <project path="packages/providers/WeatherProvider" name="android_packages_providers_WeatherProvider" />
   <project path="packages/screensavers/Basic" name="android_packages_screensavers_Basic" groups="pdk-fs" />
   <project path="packages/screensavers/PhotoTable" name="android_packages_screensavers_PhotoTable" groups="pdk-fs" />
   <project path="packages/screensavers/WebView" name="android_packages_screensavers_WebView" groups="pdk-fs" />
+  <project path="packages/services/LiveLockScreenService" name="android_packages_services_LiveLockScreenService" groups="pdk-cw-fs,pdk-fs" />
   <project path="packages/services/Mms" name="android_packages_services_Mms" groups="pdk-cw-fs,pdk-fs" />
   <project path="packages/services/Telecomm" name="android_packages_services_Telecomm" groups="pdk-cw-fs,pdk-fs" />
   <project path="packages/services/Telephony" name="android_packages_services_Telephony" groups="pdk-cw-fs,pdk-fs" />
@@ -340,6 +346,10 @@
   <project path="vendor/qcom/opensource/time-services" name="android_vendor_qcom_opensource_time-services" groups="notdefault" />
 <!-- END CYANOGENMOD -->
 
+<!-- CMSDK SAMPLES -->
+  <project path="vendor/cmsdk/samples/weatherproviderservice" name="android_packages_apps_WundergroundWeatherProvider" groups="notdefault" />
+<!-- END CMSDK SAMPLES -->
+
 <!-- BEGIN AOSP -->
   <project path="developers/build" name="platform/developers/build" groups="notdefault" remote="aosp" />
   <project path="developers/samples/android" name="platform/developers/samples/android" remote="aosp" />
@@ -376,7 +386,6 @@
   <project path="external/crcalc" name="platform/external/crcalc" groups="pdk-fs" remote="aosp" />
   <project path="external/deqp" name="platform/external/deqp" groups="pdk-fs" remote="aosp" />
   <project path="external/dexmaker" name="platform/external/dexmaker" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/doclava" name="platform/external/doclava" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="external/donuts" name="platform/external/donuts" groups="pdk-fs" remote="aosp" />
   <project path="external/droiddriver" name="platform/external/droiddriver" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="external/easymock" name="platform/external/easymock" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
@@ -402,7 +411,6 @@
   <project path="external/google-tv-pairing-protocol" name="platform/external/google-tv-pairing-protocol" groups="pdk-fs" remote="aosp" />
   <project path="external/gptfdisk" name="android_external_gptfdisk" groups="pdk-fs" />
   <project path="external/gtest" name="platform/external/gtest" groups="pdk" remote="aosp" />
-  <project path="external/guava" name="platform/external/guava" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="external/hamcrest" name="platform/external/hamcrest" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="external/harfbuzz_ng" name="platform/external/harfbuzz_ng" groups="pdk,qcom_msm8x26" remote="aosp" />
   <project path="external/hyphenation-patterns" name="platform/external/hyphenation-patterns" groups="pdk-fs" remote="aosp" />
@@ -502,7 +510,6 @@
   <project path="external/valgrind" name="platform/external/valgrind" groups="pdk" remote="aosp" />
   <project path="external/vboot_reference" name="platform/external/vboot_reference" groups="vboot" remote="aosp" />
   <project path="external/vixl" name="platform/external/vixl" groups="pdk" remote="aosp" />
-  <project path="external/vogar" name="platform/external/vogar" groups="pdk" remote="aosp" />
   <project path="external/webp" name="platform/external/webp" groups="pdk,qcom_msm8x26" remote="aosp" />
   <project path="external/webrtc" name="platform/external/webrtc" groups="pdk" remote="aosp" />
   <project path="external/xmlwriter" name="platform/external/xmlwriter" groups="pdk-cw-fs,pdk-fs" remote="aosp" />