Merge "Revert "nfc: reflect style guide."" am: ea4b569fee am: a2bdc9d012

am: 99af2885ee

Change-Id: Id4f8a63dd22750ba5311e30e626876f0763447a9
This commit is contained in:
Martijn Coenen
2016-10-04 16:53:28 +00:00
committed by android-build-merger

Diff Content Not Available