diff options
| author | Nick Pelly <npelly@google.com> | 2010-12-05 14:49:00 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-12-05 14:49:00 -0800 |
| commit | 28e8c66d4bb0c6e13b65d48767851dd02d554ebb (patch) | |
| tree | 2e8ce4d39d9ac737fa66067249678afe37a48d87 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 18cbfecd8ab587fa049dfc668755a6bd6ddb10d9 (diff) | |
| parent | d8c323321c28a0a5ff70c6e0694aa822edca4005 (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"
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions