Commit 2a1b04c1 authored by Nick Pelly's avatar Nick Pelly Committed by Android Git Automerger
Browse files

am 078e8368: Merge "Set up DISCOVERY and SE notification callbacks at NFC init." into ics-mr1 

* commit '078e8368':
  Set up DISCOVERY and SE notification callbacks at NFC init.
parents c0cd50db 078e8368
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment