| commit | f2135d166fc3b459df137df5b6642f015620e4d6 | [log] [tgz] |
|---|---|---|
| author | Jean-Michel Trivi <jmtrivi@google.com> | Wed Mar 28 22:48:11 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Mar 28 22:48:11 2018 +0000 |
| tree | 79f2e4e94a71c6dcbe60ae0e37d93500f22982df | |
| parent | 57f25ad657598248888b664454ac590b2ade3967 [diff] | |
| parent | 77fca220444d82c16d47e2c939d0f9c743877c71 [diff] |
Merge "Merge "MediaPlayer subtitle data / time discontinuity interfaces" into pi-dev am: 26ef7344c9" into pi-dev-plus-aosp am: 77fca22044 Change-Id: Icc7994f8625023f2f5c9c76081e17b9d6d166f19