OSDN Git Service

am 0cc0492e: am 3fb2be64: Merge "NFC HAL: Use a separate callback for data." into...
authorMartijn Coenen <maco@google.com>
Mon, 1 Oct 2012 21:06:34 +0000 (14:06 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Oct 2012 21:06:34 +0000 (14:06 -0700)
* commit '0cc0492eaba1c3bc9626534ef75832fec51bd966':
  NFC HAL: Use a separate callback for data.


Trivial merge