Skip to content

Commit

Permalink
Merge branch 'LineageOS-cm-14.1' into twrp-14.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Joshua committed Feb 1, 2017
2 parents 0f93ed0 + 83b0d10 commit ec436b7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion default.xml
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,6 @@
<!-- project path="packages/apps/Provision" name="platform/packages/apps/Provision" groups="pdk-fs" remote="aosp" /> -->
<!-- project path="packages/apps/SafetyRegulatoryInfo" name="LineageOS/android_packages_apps_SafetyRegulatoryInfo" /> -->
<!-- project path="packages/apps/Settings" name="LineageOS/android_packages_apps_Settings" groups="pdk-fs" /> -->
<!-- project path="packages/apps/SoundRecorder" name="LineageOS/android_packages_apps_SoundRecorder" groups="pdk-fs" /> -->
<!-- project path="packages/apps/Stk" name="LineageOS/android_packages_apps_Stk" groups="apps_stk,pdk-fs" /> -->
<!-- project path="packages/apps/StorageManager" name="LineageOS/android_packages_apps_StorageManager" /> -->
<!-- project path="packages/apps/Tag" name="LineageOS/android_packages_apps_Tag" groups="pdk-fs" /> -->
Expand Down
2 changes: 1 addition & 1 deletion snippets/cm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<!-- project path="packages/apps/Gello" name="LineageOS/android_packages_apps_Gello" /> -->
<!-- project path="packages/apps/LockClock" name="LineageOS/android_packages_apps_LockClock" /> -->
<!-- project path="packages/apps/Profiles" name="LineageOS/android_packages_apps_Profiles" /> -->
<!-- project path="packages/apps/Screencast" name="LineageOS/android_packages_apps_Screencast" /> -->
<!-- project path="packages/apps/Recorder" name="LineageOS/android_packages_apps_Recorder" /> -->
<!-- project path="packages/apps/SetupWizard" name="LineageOS/android_packages_apps_SetupWizard" /> -->
<!-- project path="packages/apps/Snap" name="LineageOS/android_packages_apps_Snap" /> -->
<!-- project path="packages/apps/ThemeChooser" name="LineageOS/android_packages_apps_ThemeChooser" /> -->
Expand Down

0 comments on commit ec436b7

Please sign in to comment.