John W. Bruce ddf83bb028 Merge "Document CryptoInfo Settings for CENC 2016 & HLS Audio" into pi-dev am: 6ab6a9d433 ...

am: 889da15d94

Change-Id: I9ef9a16a6175840f8f72800400bcdc6d2ec9684e

2018-03-23 04:33:54 +00:00

..

media

Merge "Document CryptoInfo Settings for CENC 2016 & HLS Audio" into pi-dev am: 6ab6a9d433

2018-03-23 04:33:54 +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