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

Skip to content
Commit 51da6168 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'eclair' of... 

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

Conflicts:
	res/values/strings.xml
	src/com/android/deskclock/DeskClock.java
parents 7bacb818 5553de61
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