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

Skip to content
Commit 553635e8 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/java/com/android/internal/telephony/IccSmsInterfaceManager.java
	src/java/com/android/internal/telephony/RIL.java

Change-Id: I3494be9ac45ef0b6eeefdd1b0f6952242a81618e
parents abebcf87 449cbf85
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