Merge "Update to the new NFC APIs." into gingerbread
tree: 6a7427586f7880adc462057207ea88704d79347f
  1. canon/
  2. res/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml