tree fc1c7e6005117fc8ecfad57a6b05af5ef508f979
parent 7e5e66d00fe01c2c8a980ee47c6d654c42574754
parent dacb0c215d2423f460ca9e8e716ca3c7328192e0
author Martijn Coenen <maco@google.com> 1446453278 +0000
committer android-build-merger <android-build-merger@google.com> 1446453278 +0000

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

* commit 'dacb0c215d2423f460ca9e8e716ca3c7328192e0':
  Fix 256-bit Thinfilm NFC barcode.