diff options
| author | Martijn Coenen <maco@google.com> | 2015-04-17 07:25:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-17 07:25:27 +0000 |
| commit | cb4776254c92e4b8c05e2bd60e730aa76b55358f (patch) | |
| tree | 57d9b0bd690d901f3eb22fa31cf677d6f9215914 /api | |
| parent | 47e743b9e276d89ded2b9c50af61db2ce5529706 (diff) | |
| parent | e386f7f5108e9c2aa7547394f23d5936d7993cfe (diff) | |
| download | frameworks_base-cb4776254c92e4b8c05e2bd60e730aa76b55358f.zip frameworks_base-cb4776254c92e4b8c05e2bd60e730aa76b55358f.tar.gz frameworks_base-cb4776254c92e4b8c05e2bd60e730aa76b55358f.tar.bz2 | |
am e386f7f5: Merge "Expose peer LLCP version in NDEF callbacks."
* commit 'e386f7f5108e9c2aa7547394f23d5936d7993cfe':
Expose peer LLCP version in NDEF callbacks.
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 06b4a38..263cb5f 100644 --- a/api/current.txt +++ b/api/current.txt @@ -18443,6 +18443,7 @@ package android.nfc { public final class NfcEvent { field public final android.nfc.NfcAdapter nfcAdapter; + field public final byte peerLlcpVersion; } public final class NfcManager { diff --git a/api/system-current.txt b/api/system-current.txt index de480e3..f6b1977 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -20027,6 +20027,7 @@ package android.nfc { public final class NfcEvent { field public final android.nfc.NfcAdapter nfcAdapter; + field public final byte peerLlcpVersion; } public final class NfcManager { |