commit 368f5743636d24a6ff70a53b6c9073477cd60ede
author Eric Laurent <elaurent@google.com> Tue Dec 22 23:41:59 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Dec 22 23:41:59 2009 -0800
tree d46c73d0233b2baecf3c1cccb24c86d8d51b6ed6
parent 9d1447eddd8128f73640cc11ef5aa0b04abaaf5d
parent 7ddd450f91dc508b26cc550f5b42fded8a731654

am eb5ffc23: Merge change Id8e98194 into eclair

Merge commit 'eb5ffc239b6482b9c1e046f6f5872187043d852c' into eclair-plus-aosp

* commit 'eb5ffc239b6482b9c1e046f6f5872187043d852c':
  Fix issues 2333450 and 2333559:

include/media/mediaplayer.h

diff --git a/include/media/mediaplayer.h b/include/media/mediaplayer.h
index b91b47e..7132b18 100644
--- a/include/media/mediaplayer.h
+++ b/include/media/mediaplayer.h
@@ -75,7 +75,7 @@
 // 'notify' is invoked with the following:
 //   'msg' is set to MEDIA_INFO.
 //   'ext1' should be a value from the enum media_info_type.
-//   'ext2' contains an implementation dependant error code to provide
+//   'ext2' contains an implementation dependant info code to provide
 //          more details. Should default to 0 when not used.
 //
 // The codes are distributed as follow: