OSDN Git Service

Merge "Revert "Revert "Revert "nfc: reflect style guide."""" am: 13e19421b3 am: 56fb3...
authorSteven Moreland <smoreland@google.com>
Thu, 6 Oct 2016 03:06:53 +0000 (03:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Oct 2016 03:06:53 +0000 (03:06 +0000)
am: 9e052ff786

Change-Id: I402dd944ab1c620a35075da8681ca277ad5efbbf


Trivial merge