tree 36466fe037a429ca96c0e61e72abb6bbc455b0dc
parent 12807b8e5a1bb435eae58489ec2bdc7ff58ad6f5
parent f644e0182e68dd9488594e729408a71dad330f72
author Martijn Coenen <maco@google.com> 1446558634 +0000
committer android-build-merger <android-build-merger@google.com> 1446558634 +0000

Merge "add PN54x chip selection" am: 8c3bbf44cb
am: f644e0182e

* commit 'f644e0182e68dd9488594e729408a71dad330f72':
  add PN54x chip selection