summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2013-06-14 09:11:18 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-06-14 09:11:18 -0700
commit224309a0f21e37d58fa62ed2aef8b444421cdc0f (patch)
tree26ac2e8186533100777a646fbebce40ea8d95ea8 /media
parent05f2dea7b69ed15de023c1283ea9854cd8edd310 (diff)
parent767227fcac7be843b338473954420d390e354bf7 (diff)
downloadframeworks_av-224309a0f21e37d58fa62ed2aef8b444421cdc0f.zip
frameworks_av-224309a0f21e37d58fa62ed2aef8b444421cdc0f.tar.gz
frameworks_av-224309a0f21e37d58fa62ed2aef8b444421cdc0f.tar.bz2
am 767227fc: am 82fc2ca6: am d5018116: Merge "Fix typo."
* commit '767227fcac7be843b338473954420d390e354bf7': 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");
}
}