tree 33db58b7899dee1d23cfcb99f5b894584a3cee5e
parent 96bf21312d05ae746aeb418e4efddede308714ae
parent 65fef348ded531f1a10b41a30454cb48b4029a4c
author Chalard Jean <jchalard@google.com> 1538643473 -0700
committer android-build-merger <android-build-merger@google.com> 1538643473 -0700

Merge "Delay global alerts by 1s for high thresholds" am: afffa37248
am: 65fef348de

Change-Id: Iaabb31586e9e747871a526dc7ebb7deeb65d8f83