Jean-Michel Trivi f2135d166f Merge "Merge "MediaPlayer subtitle data / time discontinuity interfaces" into pi-dev am: 26ef7344c9" into pi-dev-plus-aosp ...

am: 77fca22044

Change-Id: Icc7994f8625023f2f5c9c76081e17b9d6d166f19

2018-03-28 22:48:11 +00:00

..

media

Merge "Merge "MediaPlayer subtitle data / time discontinuity interfaces" into pi-dev am: 26ef7344c9" into pi-dev-plus-aosp

2018-03-28 22:48:11 +00:00

mtp

Merge "Guard against null server" into pi-dev

2018-03-27 17:54:21 +00:00

service/media

…