summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2013-06-14 05:48:38 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-06-14 05:48:38 -0700
commit767227fcac7be843b338473954420d390e354bf7 (patch)
treeee4f0420181d6eea21f8b6ac03e3c1cb251709aa /media
parentccc366a90fdd8d9df5de27820f04bc534d122c07 (diff)
parent82fc2ca6905978b4f49f2c6bf948a6872575f2cc (diff)
downloadframeworks_av-767227fcac7be843b338473954420d390e354bf7.zip
frameworks_av-767227fcac7be843b338473954420d390e354bf7.tar.gz
frameworks_av-767227fcac7be843b338473954420d390e354bf7.tar.bz2
am 82fc2ca6: am d5018116: Merge "Fix typo."
* commit '82fc2ca6905978b4f49f2c6bf948a6872575f2cc': Fix typo.
Diffstat (limited to 'media')
-rw-r--r--media/libmedia/mediaplayer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp
index 68cbdf5..963b04f 100644
--- a/media/libmedia/mediaplayer.cpp
+++ b/media/libmedia/mediaplayer.cpp
@@ -124,7 +124,7 @@ status_t MediaPlayer::attachNewPlayer(const sp<IMediaPlayer>& player)
mCurrentState = MEDIA_PLAYER_INITIALIZED;
err = NO_ERROR;
} else {
- ALOGE("Unable to to create media player");
+ ALOGE("Unable to create media player");
}
}