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

Skip to content
Commit 95dbfaf1 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge tag 'android-4.2.2_r1' of... 

Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/frameworks/opt/telephony into 1.1

Android 4.2.2 release 1

Conflicts:
	src/java/com/android/internal/telephony/CallManager.java

Change-Id: Ia67be62cdd0f4f7123a19706ada701449897c796
parents 91c91511 f08c4c89
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