Skip to content
Commit 3798d52c authored by Bryan Ferris's avatar Bryan Ferris Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict app transition... 

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict app transition maximum duration" into pi-dev am: 7a77f798 -s ours am: 2ad9d38a am: 13500411 -s ours am: 26a812e6

Change-Id: Ifb43f6915e7c95ba276ccbbdfad9fee99ced787c
parents f559e859 26a812e6
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