Nick Pelly 28e8c66d4b 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"

2010-12-05 14:49:00 -08:00

..

config

…

java

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

2010-12-05 14:49:00 -08:00

jni

am 251384a7: Merge "Improve performance when getting styled string."

2010-11-19 10:25:09 -08:00

res

am 3e6fb5d6: Merge "Import revised translations. DO NOT MERGE" into gingerbread

2010-11-30 11:48:00 -08:00

tests

am 3591bebd: Merge "Restore Wi-Fi configuration after the test. DO NOT MERGE" into gingerbread

2010-12-02 13:44:54 -08:00