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

Skip to content
Commit 4c07d024 authored by Craig Mautner's avatar Craig Mautner
Browse files

Merge commit 'f5030ecb' into manualmerge 

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

Change-Id: Ie38e3e8b82f588d36e955664904f3ab84bdfaaf5
parents 069438d3 f5030ecb
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