Skip to content
Commit 9724e46c authored by Chalard Jean's avatar Chalard Jean Committed by android-build-merger
Browse files

[automerger skipped] Merge "Delay global alerts by 1s for high thresholds"... 

[automerger skipped] Merge "Delay global alerts by 1s for high thresholds" into pi-dev am: 688358e8  -s ours
am: 4e6f3989  -s ours

Change-Id: I8343d023ec9584b2a592114e51d588a4c67d83e9
parents 37c3c958 4e6f3989
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