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

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


Uprev AOSP to android-15.0.0_r7 (AP4A.241205.013.A2) which brings in
SPL for 2024-12-05

 Conflicts:
	default.xml

Signed-off-by: default avatarMattijs Korpershoek <mkorpershoek@baylibre.com>
parents 4d0f1c14 259a92e8
No related branches found
No related tags found
1 merge request!102Uprev AOSP to android-15.0.0_r7 (AP4A.241205.013)
Hide whitespace changes
Inline Side-by-side
Showing
with 42 additions and 100 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment