Merge "MediaPlayer: add 2 more info notifications for playback error" into oc-dev

author Wei Jia <wjia@google.com>

Sat, 8 Apr 2017 00:33:57 +0000 (00:33 +0000)

committer android-build-merger <android-build-merger@google.com>

Sat, 8 Apr 2017 00:33:57 +0000 (00:33 +0000)
author Wei Jia <wjia@google.com>
Sat, 8 Apr 2017 00:33:57 +0000 (00:33 +0000)
committer android-build-merger <android-build-merger@google.com>
Sat, 8 Apr 2017 00:33:57 +0000 (00:33 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
author	Wei Jia <wjia@google.com>
	Sat, 8 Apr 2017 00:33:57 +0000 (00:33 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Sat, 8 Apr 2017 00:33:57 +0000 (00:33 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history