Skip to content
Commit 675100c4 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 am: 306b8b41 -s ours am: 6b1b2f4e am: 0a6632ef

Change-Id: I06fd137d186c6eb8e2b3382e4ac71aa37bcaa55e
parents a0a67f6d 0a6632ef
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