diff options
| author | Nick Pelly <npelly@google.com> | 2011-01-21 15:53:31 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-21 15:53:31 -0800 |
| commit | 3965ebbb038cbedc1739eb657d80913af735fa7c (patch) | |
| tree | a3e0db7a36d44cfb1d4dfda063a3a7ecb51987d6 /core | |
| parent | d243ef29d04e6746ac4697a726f889f9bbbb8ce6 (diff) | |
| parent | 274ee68d32237d95f05c269c250146d9b3202fbc (diff) | |
| download | frameworks_base-3965ebbb038cbedc1739eb657d80913af735fa7c.zip frameworks_base-3965ebbb038cbedc1739eb657d80913af735fa7c.tar.gz frameworks_base-3965ebbb038cbedc1739eb657d80913af735fa7c.tar.bz2 | |
am 274ee68d: am ccc9a9e5: am b735aa0b: Merge "Fix javadoc which broke build." into gingerbread
* commit '274ee68d32237d95f05c269c250146d9b3202fbc':
Fix javadoc which broke build.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/nfc/technology/IsoDep.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/nfc/technology/IsoDep.java b/core/java/android/nfc/technology/IsoDep.java index d58de9e..c58127a 100644 --- a/core/java/android/nfc/technology/IsoDep.java +++ b/core/java/android/nfc/technology/IsoDep.java @@ -62,7 +62,7 @@ public final class IsoDep extends BasicTagTechnology { /** * Sets the timeout of an IsoDep transceive transaction in milliseconds. * If the transaction has not completed before the timeout, - * any ongoing {@link BasicTagTechnology#transceive} operation will be + * any ongoing {@link #transceive} operation will be * aborted and the connection to the tag is lost. This setting is applied * only to the {@link Tag} object linked to this technology and will be * reset when {@link IsoDep#close} is called. |