| commit | d579be0cf234a35273f79676c102b8bd80e071dc | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Wed Jun 01 17:16:59 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jun 01 17:17:00 2016 +0000 |
| tree | 8fa4d4451ad38994367b753a3eeb491dc55f2c16 | |
| parent | 93193135b184a2f1c7518d8beeff7c51b2880606 [diff] | |
| parent | ed78114ffdd9e7fdd2c3b804a4359ae28fa38019 [diff] |
Merge "Fix deadlock when showing subtitles MediaPlayer" into nyc-dev