tree ddeeaa27a4f6a30a7592501fb0f72b3b6411fc29
parent 14a531a2bf46a852e163995ff1a4a3f20fd7dbce
parent 238cce657e58a243447f0a4de644502e5db5dac1
author Martijn Coenen <maco@google.com> 1343278111 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343278111 -0700

am 238cce65: am 69369b77: am 43f22631: Fix type of collision resolution record.

* commit '238cce657e58a243447f0a4de644502e5db5dac1':
  Fix type of collision resolution record.