am ff39bc6d: (-s ours) am 17abc6eb: (-s ours) Merge "Remove NFC I2C workaround for Prime (DO NOT MERGE)." into ics-mr0

* commit 'ff39bc6d4fb3fa08fc55721a8962c713751fca09':
  Remove NFC I2C workaround for Prime (DO NOT MERGE).
tree: 77c2c2d626ec36d1873be955fbcc161667b16be8
  1. inc/
  2. Linux_x86/
  3. src/
  4. Android.mk
  5. CleanSpec.mk