OSDN Git Service

Merge "Unhide the android.media.[Media]DataSource interface."
authorChris Watkins <watk@google.com>
Thu, 16 Apr 2015 17:06:37 +0000 (17:06 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 16 Apr 2015 17:06:46 +0000 (17:06 +0000)
1  2 
api/current.txt
api/system-current.txt
media/jni/Android.mk

diff --cc api/current.txt
Simple merge
Simple merge
Simple merge