Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb8403b0 authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-18.1' into v1-r

parents 1a66e8f4 a43f6525
Loading
Loading
Loading
Loading
+2 −2
Original line number Original line Diff line number Diff line
@@ -573,7 +573,7 @@
  <project path="packages/apps/PermissionController" name="e/os/android_packages_apps_PackageInstaller" groups="pdk-cw-fs,pdk-fs" remote="e" />
  <project path="packages/apps/PermissionController" name="e/os/android_packages_apps_PackageInstaller" groups="pdk-cw-fs,pdk-fs" remote="e" />
  <project path="packages/apps/PhoneCommon" name="LineageOS/android_packages_apps_PhoneCommon" groups="pdk-cw-fs,pdk-fs" />
  <project path="packages/apps/PhoneCommon" name="LineageOS/android_packages_apps_PhoneCommon" groups="pdk-cw-fs,pdk-fs" />
  <project path="packages/apps/Provision" name="platform/packages/apps/Provision" groups="pdk-fs" remote="aosp" />
  <project path="packages/apps/Provision" name="platform/packages/apps/Provision" groups="pdk-fs" remote="aosp" />
  <project path="packages/apps/QuickAccessWallet" name="platform/packages/apps/QuickAccessWallet" groups="pdk-fs" remote="aosp" />
  <project path="packages/apps/QuickAccessWallet" name="LineageOS/android_packages_apps_QuickAccessWallet" groups="pdk-fs" />
  <project path="packages/apps/SafetyRegulatoryInfo" name="LineageOS/android_packages_apps_SafetyRegulatoryInfo" groups="pdk-fs" />
  <project path="packages/apps/SafetyRegulatoryInfo" name="LineageOS/android_packages_apps_SafetyRegulatoryInfo" groups="pdk-fs" />
  <project path="packages/apps/SampleLocationAttribution" name="platform/packages/apps/SampleLocationAttribution" groups="pdk-fs" remote="aosp" />
  <project path="packages/apps/SampleLocationAttribution" name="platform/packages/apps/SampleLocationAttribution" groups="pdk-fs" remote="aosp" />
  <project path="packages/apps/SecureElement" name="LineageOS/android_packages_apps_SecureElement" groups="apps_se,pdk-fs" />
  <project path="packages/apps/SecureElement" name="LineageOS/android_packages_apps_SecureElement" groups="apps_se,pdk-fs" />
@@ -687,7 +687,7 @@
  <project path="system/bt" name="LineageOS/android_system_bt" groups="pdk" />
  <project path="system/bt" name="LineageOS/android_system_bt" groups="pdk" />
  <project path="system/bpf" name="platform/system/bpf" groups="pdk" remote="aosp" />
  <project path="system/bpf" name="platform/system/bpf" groups="pdk" remote="aosp" />
  <project path="system/bpfprogs" name="platform/system/bpfprogs" groups="pdk" remote="aosp" />
  <project path="system/bpfprogs" name="platform/system/bpfprogs" groups="pdk" remote="aosp" />
  <project path="system/ca-certificates" name="platform/system/ca-certificates" groups="pdk" remote="aosp" />
  <project path="system/ca-certificates" name="LineageOS/android_system_ca-certificates" groups="pdk" />
  <project path="system/chre" name="platform/system/chre" groups="pdk" remote="aosp" />
  <project path="system/chre" name="platform/system/chre" groups="pdk" remote="aosp" />
  <project path="system/connectivity/wificond" name="platform/system/connectivity/wificond" groups="pdk" remote="aosp" />
  <project path="system/connectivity/wificond" name="platform/system/connectivity/wificond" groups="pdk" remote="aosp" />
  <project path="system/connectivity/wifilogd" name="platform/system/connectivity/wifilogd" groups="pdk" remote="aosp" />
  <project path="system/connectivity/wifilogd" name="platform/system/connectivity/wifilogd" groups="pdk" remote="aosp" />