Skip to content
Snippets Groups Projects
Commit 21f979a0 authored by Mattijs Korpershoek's avatar Mattijs Korpershoek
Browse files

Merge remote-tracking branch 'aosp/android-15.0.0_r4' into ti-android-15


Uprev AOSP to android-15.0.0_r4 (AP3A.241105.007) which brings in SPL
for 2024-11-05

 Conflicts:
	default.xml

Signed-off-by: default avatarMattijs Korpershoek <mkorpershoek@baylibre.com>
parents 231b3bb4 ba7d4769
No related branches found
No related tags found
1 merge request!93Uprev AOSP to android-15.0.0_r4 (AP3A.241105.007)
......@@ -4,15 +4,15 @@
<remote name="aosp"
fetch="https://android.googlesource.com/"
review="https://android-review.googlesource.com/" />
<remote name="github"
<remote name="github"
fetch="https://github.com/" />
<remote name="baylibre"
fetch="https://gitlab.baylibre.com/baylibre/ti/android/aosp" />
<default revision="refs/tags/android-15.0.0_r1"
<remote name="baylibre"
fetch="https://gitlab.baylibre.com/baylibre/ti/android/aosp" />
<default revision="refs/tags/android-15.0.0_r4"
remote="aosp"
sync-j="4" />
<superproject name="platform/superproject" remote="aosp" revision="android-15.0.0_r1"/>
<superproject name="platform/superproject" remote="aosp" revision="android-15.0.0_r4"/>
<contactinfo bugurl="go/repo-bug" />
<!-- BEGIN open-source projects -->
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment