Jeff Tinker 965cedd5ee resolved conflicts for merge of 3db90f54 to master ...

Change-Id: Ie9e46292e003fefce9ca44a31cb338a0ecf51930

2014-04-01 16:57:14 -07:00

..

castv2

Support CAST V2 authentication

2014-04-01 14:26:27 -07:00

demo

Add ExoPlayerDemo.apk to vendor/widevine so partners can access

2013-11-06 14:28:09 -08:00

gmock

Updated gMock to 1.7.0

2014-03-10 11:55:41 -07:00

java

Use the new borg-based proxy server for MediaDrmAPITest

2014-03-04 18:43:50 +00:00

unit

resolved conflicts for merge of f111bea1 to master

2014-03-31 17:35:24 -07:00