am 31bfdf69: reconcile main tree with open-source eclair
Merge commit '31bfdf695ef741f64066ef605bd6a7e23df88714' into eclair-plus-aosp
* commit '31bfdf695ef741f64066ef605bd6a7e23df88714':
android-2.1_r1 snapshot
Use 128p map tiles for high dpi devices.
Throttle nitz updates as the are too numerous on cdma.
don't request a sync when temp providers are created
Increase light sensor delay from one to two seconds.
Revert jparks code from IPCThreadState.
Add a warning when we leave threads in the binder thread pool in the background scheduling group.
PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
Fix regression.
Fix broken build.
Bluetooth A2DP suspend/resume functionality
EventLog when a database file is deleted due to corruption.
Don't forget to clear "backup in progress" state when finishing a pass
Fix issue #2148939: Sholes slow to wake up in landscape mode
Fix Cdma re-start of default connection.
Merge change 26821 into eclair
Not all WebView's host have permission to read the history.
Merge change 26908 into eclair
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: