tree f0ed9eb81e14b7de2cb2b72fa4bcccdac2eb093b
parent ad04de7f13704e62ed81318c4fd2d6ddae7d7ced
parent 3313147682e4b1b8e66aac5f48e8100a931d3034
author Steven Moreland <smoreland@google.com> 1475688819 +0000
committer android-build-merger <android-build-merger@google.com> 1475688819 +0000

Merge "Revert "Revert "nfc: update default implementation to match style.""" am: 67f700350a am: 4484643519
am: 3313147682

Change-Id: Id5fe149c05b38408318b0c57ec47b0fe9d7f01f4