Jeff Tinker d875310a76 am d3e06ad1: am eafc65e7: resolved conflicts for merge of 65a35c7d to klp-dev ...

* commit 'd3e06ad1e5b58b4d81c5e465d753fc6e08fc8273':
  Update DASH demo player for OEMs

2014-04-05 00:36:55 +00:00

..

castv2

Add signature|system permission to MediaDrm signer APIs

2014-04-02 23:41:12 +00:00

demo

Update DASH demo player for OEMs

2014-04-04 12:09:53 -07: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

Add Support for Audio MIME Types

2014-04-02 15:39:12 -07:00