summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2015-03-10 15:23:06 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-10 15:23:06 +0000
commitc2826fb922ba1626920907fa892cbc98e0db64a6 (patch)
treecff56fa05d2ccb76a4f6438176e027838e52ae34 /media
parent8ced0357152a9df64c9e21c8f3cec69cc7e8403d (diff)
parent3d333c745f928ca1595aca111d9938fa3cf3e282 (diff)
downloadframeworks_base-c2826fb922ba1626920907fa892cbc98e0db64a6.zip
frameworks_base-c2826fb922ba1626920907fa892cbc98e0db64a6.tar.gz
frameworks_base-c2826fb922ba1626920907fa892cbc98e0db64a6.tar.bz2
am 3d333c74: Merge "Fix typos in AudioManager javadoc"
* commit '3d333c745f928ca1595aca111d9938fa3cf3e282': Fix typos in AudioManager javadoc
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/AudioManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java
index 240faef..620f0ac 100644
--- a/media/java/android/media/AudioManager.java
+++ b/media/java/android/media/AudioManager.java
@@ -259,7 +259,7 @@ public class AudioManager {
"android.intent.action.HEADSET_PLUG";
/**
- * Broadcast Action: A sticky broadcast indicating an HMDI cable was plugged or unplugged
+ * Broadcast Action: A sticky broadcast indicating an HDMI cable was plugged or unplugged.
*
* The intent will have the following extra values: {@link #EXTRA_AUDIO_PLUG_STATE},
* {@link #EXTRA_MAX_CHANNEL_COUNT}, {@link #EXTRA_ENCODINGS}.