Merge "Fix Mifare plus SL2 detection." into gingerbread
tree: 723ee0c4bf6ed920ed7b031347c86e1a0c64cd41
  1. inc/
  2. Linux_x86/
  3. src/
  4. Android.mk