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

Skip to content
Commit 22653e83 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'eclair-release' of... 

Merge branch 'eclair-release' of git://android.git.kernel.org/platform/packages/apps/DeskClock into eclair

Conflicts:
	res/values/strings.xml
parents 0a18ea17 6ecdeccc
Hide whitespace changes
Inline Side-by-side
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