John W. Bruce 1cd093795e Resolve Merge Disparity ...

The same merge conflict happened in the Widevine and Android repos, but
it was resolved differently. This patch brings the resolutions back in
sync.

Bug: 111504510
Bug: 111505796
Bug: 115358798
Test: Android Build
Change-Id: I5161ae3e1aad41ee034dc5fec59dad1c7699d65c

2019-01-15 16:46:14 -08:00

..

castv2

vendor/widevine: Set LOCAL_SDK_VERSION where possible.

2018-02-27 18:58:17 +00:00

demo

Add HDCP, HEVC and VP9 content samples to ExoPlayer

2015-11-30 10:14:37 -08:00

java/MediaDrmApiTest

Move MediaDrmApiTest to its own folder.

2018-12-04 15:21:09 -08:00

unit

Resolve Merge Disparity

2019-01-15 16:46:14 -08:00