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

Commit b95e7157 authored by Dirk Sigurdson's avatar Dirk Sigurdson
Browse files

Merge remote branch 'korg/eclair' into themes-eclair 

Conflicts:
	core/java/android/app/ActivityThread.java
	core/java/android/content/pm/ActivityInfo.java
	core/java/android/content/res/AssetManager.java
parents 5d293667 6ff3f8ad
Expand all Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment