tree cb673796d2803ed5d473e3e5a4bd4e76c12626fe
parent 511073b610b489c13328af7a79b6bbc0fec8f730
parent e6db7e0a239543cda3d62995708d2dd0ab0025f7
author Daniel Rosenberg <drosen@google.com> 1553654991 -0700
committer android-build-merger <android-build-merger@google.com> 1553654991 -0700

Merge "Switch Checkpoint health sleep time to ms." am: 32a8a47b07
am: e6db7e0a23

Change-Id: If71daebf5bd2d91f5dfbadee4c7707c10b667648