Merge "fix formatting on 'and'"

This commit is contained in:
Jenkins 2014-03-13 11:32:42 +00:00 committed by Gerrit Code Review
commit 9bf5d3bcdb