OSDN Git Service

Merge "MediaPlayer: add listener for subtitle data" into klp-dev
authorChong Zhang <chz@google.com>
Tue, 20 Aug 2013 18:25:05 +0000 (18:25 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 20 Aug 2013 18:25:05 +0000 (18:25 +0000)

Trivial merge