tree fc1c7e6005117fc8ecfad57a6b05af5ef508f979
parent 81ac034978edce453cf306468eb8af68dd4fec18
parent ce926cf46d2c8c689df3bbac24edf41f05daee71
author Martijn Coenen <maco@google.com> 1446453074 +0000
committer android-build-merger <android-build-merger@google.com> 1446453074 +0000

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

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