tree 387ae6abec7907cba43bddfe5e9836cd0a234dde
parent b5b7a6f8c68194e5b2c8450fb5955d765ea42cc4
parent 7e84915c17cbe9092f6c21be94bb9025d461faec
author Daniel Rosenberg <drosen@google.com> 1537913906 -0700
committer android-build-merger <android-build-merger@google.com> 1537913906 -0700

Merge "Add support for checkpointing" am: a3381ffc3f
am: 7e84915c17

Change-Id: I25333406617a7fcf2109aaa0448e6cc216bf5670