| commit | ff9e286a22b8b68ac643396e7cce88ddbe2bfdc6 | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Mon Oct 01 14:06:34 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 01 14:06:34 2012 -0700 |
| tree | f17c9290e9333da3dfcc3f396c6be591ccd5f46f | |
| parent | ae5086b648590d04ce1fb98801e078eb1e3a0ec2 [diff] | |
| parent | 0cc0492eaba1c3bc9626534ef75832fec51bd966 [diff] |
am 0cc0492e: am 3fb2be64: Merge "NFC HAL: Use a separate callback for data." into jb-mr1-dev * commit '0cc0492eaba1c3bc9626534ef75832fec51bd966': NFC HAL: Use a separate callback for data.