Merge "fix indentation"

This commit is contained in:
skal 2014-08-27 07:52:36 -07:00 committed by Gerrit Code Review
commit 49911d4df2