summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Schaub <rschaub@google.com>2015-07-01 17:12:31 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-01 17:12:31 +0000
commita50979997cd3f7a61b95f1c46cb8fddab234afe9 (patch)
tree6de990c1097a48ce878a8213b77e416573f0ba83
parentd40c423b1cdccd61ed411b0b9e3fbefd47e99f9c (diff)
parente51d6d05e9334fce5d46909ea669027762c4c0a2 (diff)
downloadframeworks_base-a50979997cd3f7a61b95f1c46cb8fddab234afe9.zip
frameworks_base-a50979997cd3f7a61b95f1c46cb8fddab234afe9.tar.gz
frameworks_base-a50979997cd3f7a61b95f1c46cb8fddab234afe9.tar.bz2
am e51d6d05: am fae35eed: Merge "docs: Changed link in Java source code comment to repair 404" into mnc-preview-docs
* commit 'e51d6d05e9334fce5d46909ea669027762c4c0a2': docs: Changed link in Java source code comment to repair 404
-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