tree 618a2b8b3933c1d13444c593911c364c347c2563
parent a30e27f69707608ebf79c5da35f4b0a979954ba3
parent 106bc9d27a271b316ce3b4237d59a908c23a4ec0
author Steven Moreland <smoreland@google.com> 1475688488 +0000
committer android-build-merger <android-build-merger@google.com> 1475688488 +0000

Revert "Revert "nfc: reflect style guide.""
am: 106bc9d27a

Change-Id: I0d29f4064a8b4fc84fe5d3a4d09d94ad9854cccb