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

Skip to content
Commit 3d0f6487 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
	src/com/android/gallery3d/filtershow/FilterShowActivity.java
	src/com/android/gallery3d/filtershow/ui/ImageCurves.java

Change-Id: I8e29f03fbb5de003e97f7180e287661bd9142a97
parents 77f2afb5 84b75bf4
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