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

Skip to content
Commit 96fee185 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'jb-release' of https://android.googlesource.com/platform/frameworks/base into aosp 

Conflicts:
	telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
	telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java

Change-Id: I7d199cab1bf8b69b94771ff6e241ae53520e0e8b
parents d0fe429e 4b9a8d75
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