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

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

Merge tag 'android-4.4.1_r1' into HEAD 

Android 4.4.1 Release 1

Conflicts:
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/SecuritySettings.java
	src/com/android/settings/Settings.java

Change-Id: Id7de234388ba9e9b4223ddab900a335424207b2f
parents d4340974 9d91d19d
Show 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