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

Skip to content
Commit 0c99b80d 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:
	services/core/java/com/android/server/am/ActivityManagerService.java

Change-Id: Iaf1a0d2664a6c485803467dbb94804239e9a5327
parents 5caa6e5c 92451b8b
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