summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Schaub <rschaub@google.com>2015-06-30 20:06:24 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-30 20:06:26 +0000
commitfae35eed99d6bc87f3a864bdd16d951136a16cc7 (patch)
tree931c027a2cf38b89c07ac387255d13ad14360323
parent9f2e92eebd05d8f37ae5f8383b4a0d63d51a9654 (diff)
parentf64c80a6cd46ce40018f66ae6f156c5f56bb68d3 (diff)
downloadframeworks_base-fae35eed99d6bc87f3a864bdd16d951136a16cc7.zip
frameworks_base-fae35eed99d6bc87f3a864bdd16d951136a16cc7.tar.gz
frameworks_base-fae35eed99d6bc87f3a864bdd16d951136a16cc7.tar.bz2
Merge "docs: Changed link in Java source code comment to repair 404" into mnc-preview-docs
-rw-r--r--core/java/android/nfc/cardemulation/CardEmulation.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/nfc/cardemulation/CardEmulation.java b/core/java/android/nfc/cardemulation/CardEmulation.java
index 64c2bc2..23d05bd 100644
--- a/core/java/android/nfc/cardemulation/CardEmulation.java
+++ b/core/java/android/nfc/cardemulation/CardEmulation.java
@@ -40,7 +40,7 @@ import java.util.List;
* NFC card emulation services.
*
* For a general introduction into NFC card emulation,
- * please read the <a href="{@docRoot}guide/topics/nfc/ce.html">
+ * please read the <a href="{@docRoot}guide/topics/connectivity/nfc/hce.html">
* NFC card emulation developer guide</a>.</p>
*
* <p class="note">Use of this class requires the