Robert Shih 23d155d7f0 Merge "MediaPlayer2: embed header in uri" into pi-dev am: c943614f2c ...

am: d8c86aa40f

Change-Id: I430c387cd4d561718680c96cfe3688ec769dc0a3

2018-03-07 06:55:34 +00:00

..

media

Merge "MediaPlayer2: embed header in uri" into pi-dev am: c943614f2c

2018-03-07 06:55:34 +00:00

mtp

Check mMediaProvider for null

2018-03-05 22:25:58 +00:00

service/media

Merge "MediaBrowserService: Clean up ConnectionRecord when browser is dead" into oc-mr1-dev

2017-09-05 20:40:25 +00:00