Fred Gylys-Colwell 302b38e6a2 Correct ExoPlayer version ...

The previous merge copied the wrong version of Exoplayer.

Change-Id: If26ecc5dc6c3374b6482bd619eafa7432f92f185

2014-07-02 14:14:01 -07:00

..

castv2

Fix cast v2 authentication unit test

2014-05-30 15:45:40 +00:00

demo

Correct ExoPlayer version

2014-07-02 14:14:01 -07:00

gmock

Merge Changes from CDM repository

2014-06-27 18:59:56 +00:00

java

Handle ResourceBusyException from MediaDrm.openSession

2014-06-26 08:59:02 -07:00

unit

resolved conflicts for merge of 7eea20df to master

2014-04-02 18:59:05 -07:00