| commit | 3d3f99de9463a25b9053bc99378df194557a4fdf | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Sun Dec 05 14:49:00 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Dec 05 14:49:00 2010 -0800 |
| tree | 1828739c054617c3bfa5cb08c15e109c60faa99b | |
| parent | fe1b942d68c5b3a399c8d5872db7f912e51b7a86 [diff] | |
| parent | 54c9d4a79aa4c01034f8c41f948f0ed546459e89 [diff] |
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"