OSDN Git Service

Merge "Unhide MediaPlayer's setDataSource method that takes optional http headers...
authorAndreas Huber <andih@google.com>
Wed, 20 Apr 2011 19:23:27 +0000 (12:23 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 20 Apr 2011 19:23:27 +0000 (12:23 -0700)

Trivial merge