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

Commit e76da9c2 authored by Craig Mautner's avatar Craig Mautner
Browse files

resolved conflicts for merge of 0a931069 to lmp-dev 

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

Change-Id: I68e8290566b51fadb5671abdd9d05faf28502e22
parents 57e2cb1d 3ef532f8
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