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

am: 2d9ee8173a  -s ours

Change-Id: I8343d023ec9584b2a592114e51d588a4c67d83e9
This commit is contained in:
Chalard Jean
2018-10-19 03:08:06 -07:00
committed by android-build-merger

Diff Content Not Available