Merge "Use ProxyFileDescriptorCallback instead of DataSourceCallback"

author Dongwon Kang <dwkang@google.com>

Fri, 22 Mar 2019 12:29:35 +0000 (12:29 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Fri, 22 Mar 2019 12:29:35 +0000 (12:29 +0000)
author Dongwon Kang <dwkang@google.com>
Fri, 22 Mar 2019 12:29:35 +0000 (12:29 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 22 Mar 2019 12:29:35 +0000 (12:29 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
diff --cc media/apex/java/android/media/MediaPlayer2.java
Simple merge
author	Dongwon Kang <dwkang@google.com>
	Fri, 22 Mar 2019 12:29:35 +0000 (12:29 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 22 Mar 2019 12:29:35 +0000 (12:29 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
media/apex/java/android/media/MediaPlayer2.java	patch \|	diff1 \|	diff2 \|	blob \| history