commit | 05ad96e9a33e4e3d5568cfc3443fcb4dd7067433 | [log] [tgz] |
---|---|---|
author | Robert Shih <robertshih@google.com> | Tue Jul 29 21:08:21 2014 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jul 28 22:45:16 2014 +0000 |
tree | 265b397aedf8d0caa42fcf526c4369d68615c1cf | |
parent | c91e82856c8556f859c1e0f1beb2bf3ecee4eca6 [diff] | |
parent | c42a96dba4beaf87875e71b8d8b77ce7154c5cdb [diff] |
Merge "MediaPlayer: scanInternalSubtitleTracks in synchronous prepare" into lmp-dev