tree 686dacaed3ac6c8e7da6554065021cec3008c135
parent 6d285cec244a15350fe3761c212300a1f6c63ac6
parent 2b108efef1f6cd6137f69db051db5aa2955b7e5c
author Paul Lawrence <paullawrence@google.com> 1550666606 -0800
committer android-build-merger <android-build-merger@google.com> 1550666606 -0800

Merge "Do not trim unless we are actually checkpointing" am: 2268c285a5 am: 9de5e3c028
am: 2b108efef1

Change-Id: I7ef6807671da4a1f34a90a5c5c14d3acca814d57