| commit | e65fa7df186cbd6a20f3aac8299a8c53e8d978f6 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Fri May 10 15:26:22 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 10 15:26:22 2013 -0700 |
| tree | da3ca4eafd65a101652ccd81dfddb5a6425ff74e | |
| parent | dc176c52952dbbd4bcf717821e09f1b5446df37e [diff] | |
| parent | 66e1bcb78a04c4d75bc12940e81418d815ae2a2d [diff] |
am 66e1bcb7: Merge "Fix punctuation difference in merge resolution" * commit '66e1bcb78a04c4d75bc12940e81418d815ae2a2d': Fix punctuation difference in merge resolution