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

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

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

Android 5.1.1 release 13

Conflicts:
	services/core/java/com/android/server/am/ActivityManagerService.java

Change-Id: I9241d8b9fe1a2b936b3d8500c6df45450d5435f4
parents 553b97af a0e574d7
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