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

Commit 220cad6d authored by Qiwen Zhao's avatar Qiwen Zhao
Browse files

Merge commit '0f3d3dd2' 

Conflicts:
	services/core/java/com/android/server/am/ActivityStack.java
	services/core/java/com/android/server/am/ActivityStackSupervisor.java
parents 2b3818e9 0f3d3dd2
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