tree 0df3e05b19b13885208f6460dbcd56ad78a7bdc8
parent 3d5c751a88de81c1cc115fba0bd663ef304c3a0e
parent 03d3856c90e002a8a313af9f361af4e1c503a176
author Daniel Rosenberg <drosen@google.com> 1544849266 -0800
committer android-build-merger <android-build-merger@google.com> 1544849266 -0800

Merge changes from topic "checkpoint-enable"
am: 03d3856c90

Change-Id: Iafa95e268f23472cd87ae857a44ccfa7398c2db4