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