John "Juce" Bruce 31aa8eea04 resolved conflicts for merge of 7eea20df to master ...

Change-Id: Ibd8b16745d36b24041856f315fbb09a6c25cf4fb

2014-04-02 18:59:05 -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

Update YT CP server URI to point to the UAT server

2014-04-01 01:36:49 +00:00

unit

resolved conflicts for merge of 7eea20df to master

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