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

Browse Source

* 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"

...

This commit is contained in:

Nick Pelly 2010-12-05 14:49:00 -08:00 committed by Android Git Automerger

parent fe1b942d68 54c9d4a79a

commit 3d3f99de94

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available