Merge "Revert "manifest: track android-15-lfs branch for fw/base"" into android-15
diff --git a/default.xml b/default.xml
index c12e22b..a25ffca 100644
--- a/default.xml
+++ b/default.xml
@@ -4,11 +4,11 @@
<remote name="aosp"
fetch="https://android.googlesource.com"
review="https://android-review.googlesource.com/" />
- <default revision="refs/tags/android-15.0.0_r6"
+ <default revision="refs/tags/android-15.0.0_r10"
remote="aosp"
sync-j="4" />
- <superproject name="platform/superproject" remote="aosp" revision="android-15.0.0_r6"/>
+ <superproject name="platform/superproject" remote="aosp" revision="android-15.0.0_r10"/>
<contactinfo bugurl="go/repo-bug" />
<!-- BEGIN open-source projects -->
diff --git a/omni-aosp.xml b/omni-aosp.xml
index bbcca0c..333a82e 100644
--- a/omni-aosp.xml
+++ b/omni-aosp.xml
@@ -54,6 +54,7 @@
<project path="packages/apps/Messaging" name="android_packages_apps_Messaging" remote="omnirom" revision="android-15" />
<project path="packages/apps/Settings" name="android_packages_apps_Settings" remote="omnirom" revision="android-15" />
<project path="packages/apps/SettingsIntelligence" name="android_packages_apps_SettingsIntelligence" remote="omnirom" revision="android-15" />
+ <project path="packages/apps/ThemePicker" name="android_packages_apps_ThemePicker" remote="omnirom" revision="android-15" />
<project path="packages/inputmethods/LatinIME" name="android_packages_inputmethods_LatinIME" remote="omnirom" revision="android-15" />
<project path="packages/modules/Virtualization" name="android_packages_modules_Virtualization" remote="omnirom" revision="android-15" />
<project path="packages/services/Mms" name="android_packages_services_Mms" remote="omnirom" revision="android-15" />
diff --git a/omni-default.xml b/omni-default.xml
index 9e1d18f..3c8c6da 100644
--- a/omni-default.xml
+++ b/omni-default.xml
@@ -23,6 +23,7 @@
<project path="external/tigervnc" name="android_external_tigervnc" remote="omnirom" revision="android-14.0" />
<project path="external/vncflinger" name="android_external_vncflinger" remote="omnirom" revision="android-15" />
<project path="external/vim" name="android_external_vim" remote="omnirom" revision="android-14.0" />
+ <project path="hardware/omni/interfaces" name="android_hardware_omni_interfaces" remote="omnirom" revision="android-15" />
<project path="packages/apps/Matlog" name="android_packages_apps_Matlog" remote="omnirom" revision="android-14.0" />
<project path="packages/apps/OmniLib" name="android_packages_apps_OmniLib" remote="omnirom" revision="android-15" />
diff --git a/omni-private.xml b/omni-private.xml
index ef1e58f..bbf2bee 100644
--- a/omni-private.xml
+++ b/omni-private.xml
@@ -7,8 +7,8 @@
<!-- private OmniROM Projects -->
<project path="packages/apps/OmniSwitch" name="android_packages_apps_OmniSwitch" remote="omnirom2" revision="android-14.0" />
<project path="packages/services/OmniJaws" name="android_packages_services_OmniJaws" remote="omnirom2" revision="android-15" />
- <project path="packages/apps/OmniRemote" name="android_packages_apps_OmniRemote" remote="omnirom2" revision="android-14.0" />
+ <project path="packages/apps/OmniRemote" name="android_packages_apps_OmniRemote" remote="omnirom2" revision="android-15" />
<project path="packages/apps/OmniControl" name="android_packages_apps_OmniControl" remote="omnirom2" revision="android-15" />
- <project path="packages/apps/OmniOta" name="android_packages_apps_OmniOta" remote="omnirom2" revision="android-14.0" />
+ <project path="packages/apps/OmniOta" name="android_packages_apps_OmniOta" remote="omnirom2" revision="android-15" />
<project path="packages/apps/OmniWallpaper" name="android_packages_apps_OmniWallpaper" remote="omnirom2" revision="android-14.0" />
</manifest>
diff --git a/remove.xml b/remove.xml
index f69f098..6b67794 100644
--- a/remove.xml
+++ b/remove.xml
@@ -36,6 +36,7 @@
<remove-project name="platform/packages/apps/Messaging" />
<remove-project name="platform/packages/apps/Settings" />
<remove-project name="platform/packages/apps/SettingsIntelligence" />
+ <remove-project name="platform/packages/apps/ThemePicker" />
<remove-project name="platform/packages/inputmethods/LatinIME" />
<remove-project name="platform/packages/modules/Virtualization" />
<remove-project name="platform/packages/services/Mms" />