tree 61b5b76063e4f81389ec3c92833184d9e5d08e43
parent fbeffa5c89094a9eec01ffb85f1c3b3773e197f2
parent e4d3c945777c912ba71e79ac99cb11190cf8f90a
author Martijn Coenen <maco@google.com> 1346344437 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346344437 -0700

am e4d3c945: Merge "Add support for target-customized NFC stack configuration"

* commit 'e4d3c945777c912ba71e79ac99cb11190cf8f90a':
  Add support for target-customized NFC stack configuration