Merge "Fix 256-bit Thinfilm NFC barcode." am: ce926cf46d
am: dacb0c215d

* commit 'dacb0c215d2423f460ca9e8e716ca3c7328192e0':
  Fix 256-bit Thinfilm NFC barcode.
tree: fc1c7e6005117fc8ecfad57a6b05af5ef508f979
  1. halimpl/
  2. src/
  3. Android.mk
  4. CleanSpec.mk
  5. MODULE_LICENSE_APACHE2
  6. NOTICE