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

Skip to content
Commit a9913a88 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Merge tag 'android-4.3_r2.1' into cm-10.2 

Android 4.3 release 2.1

Conflicts:
	Android.mk
	AndroidManifest.xml
	res/layout/alarm_time.xml
	res/values-es/strings.xml
	res/values-iw/strings.xml
	src/com/android/deskclock/DeskClock.java
	src/com/android/deskclock/Utils.java

Change-Id: I07bc60f6ebcaf3738552bfdb3b6c5ed21216755d
parents 7865ae5a bca8e677
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