Merge "Slay the NfcService beast, part one."
tree: 7d534b466ba8a76a6438b2cc15d212465028f76a
  1. jni/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml
  6. CleanSpec.mk
  7. migrate_nfc.txt