tree 36466fe037a429ca96c0e61e72abb6bbc455b0dc
parent dacb0c215d2423f460ca9e8e716ca3c7328192e0
parent 8c3bbf44cbb767b12d79e7402dc8178bd5db07c7
author Martijn Coenen <maco@google.com> 1446558300 +0000
committer android-build-merger <android-build-merger@google.com> 1446558300 +0000

Merge "add PN54x chip selection"
am: 8c3bbf44cb

* commit '8c3bbf44cbb767b12d79e7402dc8178bd5db07c7':
  add PN54x chip selection