Merge "Enable NFC after the device is unlocked."
tree: 1c2e01347133ccf649e40b766fc23f850fd086be
  1. jni/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml
  6. CleanSpec.mk
  7. migrate_nfc.txt