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

Skip to content
Commit 9e9ee5d5 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:
	res/values-cs/strings.xml
	src/com/android/calendar/GeneralPreferences.java
	src/com/android/calendar/alerts/AlertReceiver.java
	src/com/android/calendar/alerts/AlertService.java
	src/com/android/calendar/alerts/AlertUtils.java

Change-Id: Ieb99951c15ff0eb484341aa07d007d0a7d14dac2
parents b2134103 71b49345
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