tree 2e8ce4d39d9ac737fa66067249678afe37a48d87
parent 18cbfecd8ab587fa049dfc668755a6bd6ddb10d9
parent d8c323321c28a0a5ff70c6e0694aa822edca4005
author Nick Pelly <npelly@google.com> 1291589340 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1291589340 -0800

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"