Merge "Remove FRP wipe via NFC bump." into mnc-dev
tree: 86d0de7874fe072ed518a298e4c36aa42ab26d56
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. CleanSpec.mk