| commit | 69369b773d2ea675aa5a18582c82e2ba65dc3a42 | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Wed Jul 25 11:32:20 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 25 11:32:20 2012 -0700 |
| tree | 41a4d2cb4e0ea055bff787566dfcab2d5ad6c89c | |
| parent | afa30410182f83efbd12eeca1fb12413da573543 [diff] | |
| parent | 43f226312d34edc17a6319f7d61a06d20e1850e7 [diff] |
am 43f22631: Fix type of collision resolution record. * commit '43f226312d34edc17a6319f7d61a06d20e1850e7': Fix type of collision resolution record.