tree ead88aa569a02bf386e8456a219940903e826327
parent c3df2486854d3931a100794cf9cebda7f21d609c
parent 2268c285a522b91bf84697baf4e4b81c743ec33a
author Paul Lawrence <paullawrence@google.com> 1550665363 -0800
committer android-build-merger <android-build-merger@google.com> 1550665363 -0800

Merge "Do not trim unless we are actually checkpointing"
am: 2268c285a5

Change-Id: I031a25204269ea7d3d65349a3f281a3f1e07eadd