summaryrefslogtreecommitdiffstats
path: root/media/java
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2010-08-04 18:05:22 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-04 18:05:22 -0700
commitef9fd39d73877162ba200ef8b2000216133dab2e (patch)
tree7a5166ace885567c07c73a2cc28c38a392e92f97 /media/java
parentaec3e36fd4f8cdcc53110bbcd7f0afa20bf315d4 (diff)
parent769f9b8980a774e3493cbd9beac565c6b5d62161 (diff)
downloadframeworks_base-ef9fd39d73877162ba200ef8b2000216133dab2e.zip
frameworks_base-ef9fd39d73877162ba200ef8b2000216133dab2e.tar.gz
frameworks_base-ef9fd39d73877162ba200ef8b2000216133dab2e.tar.bz2
am 769f9b89: am 5b86de94: fix doc bugs
Merge commit '769f9b8980a774e3493cbd9beac565c6b5d62161' into gingerbread-plus-aosp * commit '769f9b8980a774e3493cbd9beac565c6b5d62161': fix doc bugs
Diffstat (limited to 'media/java')
-rw-r--r--media/java/android/media/AudioFormat.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/AudioFormat.java b/media/java/android/media/AudioFormat.java
index b3aae72..f1fa1e8 100644
--- a/media/java/android/media/AudioFormat.java
+++ b/media/java/android/media/AudioFormat.java
@@ -19,7 +19,7 @@ package android.media;
/**
* The AudioFormat class is used to access a number of audio format and
* channel configuration constants. They are for instance used
- * in __link AudioTrack} and __link AudioRecord}.
+ * in {@link AudioTrack} and {@link AudioRecord}.
*
*/
public class AudioFormat {