Skip to content
Commit 306b8b41 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 oc-dev am: 6255311d am: e18fd339 am: b1ae5fd4 -s ours am: 2adaef29 -s ours am: e5f0ec9b

Change-Id: Ifdb327346f232f9aa8e04a6d96818a9359b1b6a7
parents ae9fd542 e5f0ec9b
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