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

Skip to content
Commit 56270580 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge remote-tracking branch 'origin/lineage-22.2' into a15 

 Conflicts:
	app/src/main/res/layout-land/fragment_now_playing.xml
	app/src/main/res/layout/fragment_now_playing.xml
parents eb31a65b 040bd2d3