| commit | cb4776254c92e4b8c05e2bd60e730aa76b55358f | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Fri Apr 17 07:25:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 17 07:25:27 2015 +0000 |
| tree | 57d9b0bd690d901f3eb22fa31cf677d6f9215914 | |
| parent | 47e743b9e276d89ded2b9c50af61db2ce5529706 [diff] | |
| parent | e386f7f5108e9c2aa7547394f23d5936d7993cfe [diff] |
am e386f7f5: Merge "Expose peer LLCP version in NDEF callbacks." * commit 'e386f7f5108e9c2aa7547394f23d5936d7993cfe': Expose peer LLCP version in NDEF callbacks.