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

Commit 770d39ca authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Merge tag 'android-5.1.1_r24' into cm-12.1 

Android 5.1.1 release 24

Conflicts:
	src/java/com/android/internal/telephony/SMSDispatcher.java
	src/java/com/android/internal/telephony/cat/AppInterface.java
	src/java/com/android/internal/telephony/cat/CatService.java

Change-Id: I31ebc1b3e1a1c9228c6c788bbbf2830fa3d94dbd
parents cdafcb6e df31d37d
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