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