Commit 78aedaf5 authored Jul 24, 2015 by Jean-Michel Trivi Committed by Android Git Automerger Jul 24, 2015

am dc9fcc3a: am 938e8e30: am 9f4b7a47: am 7b996853: Merge "MediaPlayer...

am dc9fcc3a: am 938e8e30: am 9f4b7a47: am 7b996853: Merge "MediaPlayer subtitle controller: use debug log instead of warning" into mnc-dev

* commit 'dc9fcc3a':
  MediaPlayer subtitle controller: use debug log instead of warning

parents 0e5a5161 dc9fcc3a

media/java/android/media/MediaPlayer.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -2292,7 +2292,7 @@ public class MediaPlayer implements SubtitleController.Listener

		private void scanInternalSubtitleTracks() {
		if (mSubtitleController == null) {
		Log.w(TAG, "setSubtitleAnchor in MediaPlayer");
		Log.d(TAG, "setSubtitleAnchor in MediaPlayer");
		setSubtitleAnchor();
		}