OSDN Git Service

Merge "GenericSource: timed text support" into lmp-dev
authorLajos Molnar <lajos@google.com>
Thu, 31 Jul 2014 21:43:22 +0000 (21:43 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 31 Jul 2014 19:45:19 +0000 (19:45 +0000)

Trivial merge