commit | c91e82856c8556f859c1e0f1beb2bf3ecee4eca6 | [log] [tgz] |
---|---|---|
author | Robert Shih <robertshih@google.com> | Tue Jul 29 21:07:37 2014 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jul 25 21:16:23 2014 +0000 |
tree | 8798c18fe85694af7a228300d9af49f2adb20aef | |
parent | 83a7cac87d444d838bbb71a96311ae752440b8ca [diff] | |
parent | 3cdf7c5b622a8fbb20410736bdab5888d0e1873c [diff] |
Merge "MediaPlayer: support external timed text in java" into lmp-dev