tree 41a4d2cb4e0ea055bff787566dfcab2d5ad6c89c
parent afa30410182f83efbd12eeca1fb12413da573543
parent 43f226312d34edc17a6319f7d61a06d20e1850e7
author Martijn Coenen <maco@google.com> 1343241140 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343241140 -0700

am 43f22631: Fix type of collision resolution record.

* commit '43f226312d34edc17a6319f7d61a06d20e1850e7':
  Fix type of collision resolution record.