John "Juce" Bruce f23c54d834 resolved conflicts for merge of ab95cf27 to master ...

Change-Id: I194f2a00507a8469b3f15bd2d629d41dc07c1b45

2014-03-28 16:30:31 -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 ab95cf27 to master

2014-03-28 16:30:31 -07:00