tree 22cdf7717ee09ac1520b73d9ef11b923f4fb2973
parent 9c54ce12fc6f13808cc8433a86cc7fdbcb0caee0
author Steven Moreland <smoreland@google.com> 1475722174 +0000
committer Steven Moreland <smoreland@google.com> 1475722174 +0000

Revert "Revert "Revert "update NfcAdaptation to match style."""

This reverts commit 9c54ce12fc6f13808cc8433a86cc7fdbcb0caee0.

Change-Id: Ia184f56682c83a6d39930a5c6dabafc2e3aadbf6