OSDN Git Service

am 39c21c83: Merge "MediaPlayer: support external timed text in java" into lmp-dev
authorRobert Shih <robertshih@google.com>
Tue, 29 Jul 2014 21:10:50 +0000 (21:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 29 Jul 2014 21:10:50 +0000 (21:10 +0000)
commit0d80c639821efbef1dd7ada21964c67d1daa6bb0
treeda81645c21a62fb2ef2af1f18b221a24e0696077
parent7ec0b01267b065779e24c80e401694462c89f2d3
parentc91e82856c8556f859c1e0f1beb2bf3ecee4eca6
am 39c21c83: Merge "MediaPlayer: support external timed text in java" into lmp-dev

* commit '39c21c83089961aa603272decdf3b179a5cdd063':
  MediaPlayer: support external timed text in java