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

Skip to content
Commit ee487192 authored by Keyan Mobli's avatar Keyan Mobli
Browse files

Merge branch 'gingerbread' of... 

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

Conflicts:
	res/values-ca/strings.xml

Change-Id: I18d6c58a9d9da076997e49fe930f615da1f26f8a
parents 1ebf0601 577dd971
Hide 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