Merge branch 'LineageOS-cm-14.1' into twrp-14.1

sedeg18 · Mar 6, 2017 · 94ee928 · 94ee928
2 parents f649219 + bd6cc1d
commit 94ee928
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/default.xml b/default.xml
@@ -11,7 +11,7 @@
   <remote  name="aosp"
            fetch="https://android.googlesource.com"
            review="android-review.googlesource.com"
-           revision="refs/tags/android-7.1.1_r9" />
+           revision="refs/tags/android-7.1.1_r21" />
 
   <default revision="refs/heads/cm-14.1"
            remote="github"

diff --git a/snippets/cm.xml b/snippets/cm.xml
@@ -28,6 +28,7 @@
   <!-- project path="external/unzip" name="LineageOS/android_external_unzip" /> -->
   <!-- project path="external/vim" name="LineageOS/android_external_vim" /> -->
   <project path="external/yaffs2" name="LineageOS/android_external_yaffs2" />
+<<<<<<< HEAD
   <!-- project path="external/zip" name="LineageOS/android_external_zip" /> -->
   <!-- project path="hardware/cyanogen" name="LineageOS/android_hardware_cyanogen" /> -->
   <!-- project path="frameworks/opt/hardware" name="LineageOS/android_frameworks_opt_hardware" /> -->
@@ -37,7 +38,6 @@
   <!-- project path="packages/apps/AudioFX" name="LineageOS/android_packages_apps_AudioFX" /> -->
   <!-- project path="packages/apps/Browser" name="LineageOS/android_packages_apps_Browser" /> -->
   <!-- project path="packages/apps/CMBugReport" name="LineageOS/android_packages_apps_CMBugreport" /> -->
-  <!-- project path="packages/apps/CMFileManager" name="LineageOS/android_packages_apps_CMFileManager" /> -->
   <!-- project path="packages/apps/CMParts" name="LineageOS/android_packages_apps_CMParts" /> -->
   <!-- project path="packages/apps/CMUpdater" name="LineageOS/android_packages_apps_CMUpdater" /> -->
   <!-- project path="packages/apps/Eleven" name="LineageOS/android_packages_apps_Eleven" /> -->