Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4990b515 authored by Nick Pelly's avatar Nick Pelly Committed by Android Git Automerger
Browse files

am b735aa0b: Merge "Fix javadoc which broke build." into gingerbread 

* commit 'b735aa0b':
  Fix javadoc which broke build.
parents a03ebe98 b735aa0b

core/java/android/nfc/technology/IsoDep.java

+1 −1
Original line number Diff line number Diff line
@@ -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.