tree 1f22e2e80ad0c0edff17e88ab5b78033e35126b1
parent 6d4d41261731f4e286054aa6a245d34bdeb00b7c
parent 20ea4ea28861b4ff961ff1c0c9f0e1b2f2c128b5
author Steven Moreland <smoreland@google.com> 1475722278 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1475722278 +0000

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