Commit 69369b77 authored by Martijn Coenen's avatar Martijn Coenen Committed by Android Git Automerger
Browse files

am 43f22631: Fix type of collision resolution record. 

* commit '43f22631':
  Fix type of collision resolution record.
parents afa30410 43f22631
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