summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2011-01-18 14:25:17 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-18 14:25:17 -0800
commit74ff70d2f2e90c591c58723121bc26ab44a3adcc (patch)
treefa42c6f9a8a76a76b60de43dcc9ab3ef232e03b5 /media
parent11ebdd6a7991283986c4fb94ec5f0774cc11d6da (diff)
parented6eae420fd60dcb7d90f54c3116959b75bd6276 (diff)
downloadframeworks_base-74ff70d2f2e90c591c58723121bc26ab44a3adcc.zip
frameworks_base-74ff70d2f2e90c591c58723121bc26ab44a3adcc.tar.gz
frameworks_base-74ff70d2f2e90c591c58723121bc26ab44a3adcc.tar.bz2
Merge "Fix typo" into honeycomb
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/audiofx/AudioEffect.java2
-rwxr-xr-xmedia/java/android/media/audiofx/Visualizer.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/media/java/android/media/audiofx/AudioEffect.java b/media/java/android/media/audiofx/AudioEffect.java
index 3e54627..d3e9a49 100644
--- a/media/java/android/media/audiofx/AudioEffect.java
+++ b/media/java/android/media/audiofx/AudioEffect.java
@@ -150,7 +150,7 @@ public class AudioEffect {
*/
public static final int ERROR = -1;
/**
- * Internal opreation status. Not returned by any method.
+ * Internal operation status. Not returned by any method.
*/
public static final int ALREADY_EXISTS = -2;
/**
diff --git a/media/java/android/media/audiofx/Visualizer.java b/media/java/android/media/audiofx/Visualizer.java
index 41309dc..bcf7b89 100755
--- a/media/java/android/media/audiofx/Visualizer.java
+++ b/media/java/android/media/audiofx/Visualizer.java
@@ -95,7 +95,7 @@ public class Visualizer {
*/
public static final int ERROR = -1;
/**
- * Internal opreation status. Not returned by any method.
+ * Internal operation status. Not returned by any method.
*/
public static final int ALREADY_EXISTS = -2;
/**