Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d3f99de authored by Nick Pelly's avatar Nick Pelly Committed by Android Git Automerger
Browse files

am d8c32332: Merge "Merge branch gingerbread-nfc into gingerbread." into gingerbread 

* commit 'd8c323321c28a0a5ff70c6e0694aa822edca4005':
  Fixed technology name typo's.
  Implement historical bytes / attrib on IsoDep
  Provide system code and manufacturer code for Felica tech.
  Fixed NfcAdapter init and getTechnology().
  Secure Element access implementation
  Rough first pass at the NFC technology API.
  Revert "Merge "Remove the My Tag feature." into gingerbread"
parents fe1b942d 54c9d4a7

There are no changes