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

Skip to content
Commit 15682bc6 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'gingerbread' of... 

Merge branch 'gingerbread' of git://android.git.kernel.org/platform/packages/apps/DeskClock into HEAD

Conflicts:
	res/values-fr/strings.xml

Change-Id: Ifd60ff1cf34ad0bcf96bdba3ccfddbd958446254
parents 51a4429f 6f8c93e9
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