Commit 7c360725 authored by Alex Light's avatar Alex Light Committed by android-build-merger
Browse files

Merge "Prevent abort in situations with recursive checkpoints" am: 98ac0cce am: 5b4c69aa 

am: 32da7f33

Change-Id: I739648c0594110c13e2905d4a74ee695b1fd8c87
parents d2fb951f 32da7f33
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment