tree a70e9661c02b07bba73f5f968b0c876efde8ac1b
parent b43456c3c70b46a0313942735d44a00bd371c893
parent 9c54ce12fc6f13808cc8433a86cc7fdbcb0caee0
author Treehugger Robot <treehugger-gerrit@google.com> 1475688148 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1475688150 +0000

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