tree 6088f945c41c9718f8fa2c16358da53e8f9b6ccc
parent 3768be324bc81b04f4a3a9dfbbe3324dc13cc5f0
parent 69bb15e06eea6a0e437d388273c4810682393162
author Martijn Coenen <maco@google.com> 1475599454 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1475599454 +0000

Merge "Revert "nfc: reflect style guide.""