tree 54a5f5ef943aeede20de6b5c37d39c038f4af27d
parent 2857f5f8f0ad5ed091302831f8877aaa8a2417a3
parent 9f22f3520751597bd5cd0ef9ca01b42877856b1c
author Martijn Coenen <maco@google.com> 1378229686 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378229686 -0700

am 9f22f352: Merge "Manta: NFC: Route IsoDep to the host by default." into klp-dev

* commit '9f22f3520751597bd5cd0ef9ca01b42877856b1c':
  Manta: NFC: Route IsoDep to the host by default.