Merge "Update Tag for new NfcAdapter.getDefaultAdapter(Context)" into gingerbread
tree: 7920be004799534d3e89cdcb4f281c71d694a38a
  1. canon/
  2. res/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml