| commit | 238cce657e58a243447f0a4de644502e5db5dac1 | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Wed Jul 25 15:05:31 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 25 15:05:31 2012 -0700 |
| tree | 5a28cbb02a1b5cadfcac4648d89afe3cec7b1e11 | |
| parent | 73eac104b08672181a636d23c446cf9cdd192fe5 [diff] | |
| parent | 69369b773d2ea675aa5a18582c82e2ba65dc3a42 [diff] |
am 69369b77: am 43f22631: Fix type of collision resolution record. * commit '69369b773d2ea675aa5a18582c82e2ba65dc3a42': Fix type of collision resolution record.