Merged Changes

	modified:   media/jni/android_media_ExtMediaPlayer.cpp
	modified:   policy/src/com/android/internal/policy/impl/GlobalActions.java