Jeff Tinker 267803d2c5 resolve merge conflicts of 907e26c to master ...

Change-Id: I9dc9f6943192fe2d39d87f0405953b63794123bc

2016-06-17 15:36:23 -07:00

..

AssetDescriptor.java

Rework WidevineSamplePlayer to use fragments

2016-06-13 11:27:03 -07:00

AssetFragment.java

resolve merge conflicts of 907e26c to master

2016-06-17 15:36:23 -07:00

AssetItem.java

Rework WidevineSamplePlayer to use fragments

2016-06-13 11:27:03 -07:00

AssetsPage.java

Rework WidevineSamplePlayer to use fragments

2016-06-13 11:27:03 -07:00

ClipImageView.java

Rework WidevineSamplePlayer to use fragments

2016-06-13 11:27:03 -07:00

ConfigXMLParser.java

Rework WidevineSamplePlayer to use fragments

2016-06-13 11:27:03 -07:00

DownloadFragment.java

Rework WidevineSamplePlayer to use fragments

2016-06-13 11:27:03 -07:00

FullScreenVideoView.java

Rework WidevineSamplePlayer to use fragments

2016-06-13 11:27:03 -07:00

HttpParser.java

Rework WidevineSamplePlayer to use fragments

2016-06-13 11:27:03 -07:00

ImageHandler.java

Rework WidevineSamplePlayer to use fragments

2016-06-13 11:27:03 -07:00

MediaCodecView.java

Replace deprecated APIs.

2015-12-16 17:49:57 -08:00

NonBlockingAudioTrack.java

Added a MediaCoded based video view to the widevine sample player app.

2012-06-09 12:52:43 -07:00

SettingsFragment.java

Rework WidevineSamplePlayer to use fragments

2016-06-13 11:27:03 -07:00

StreamingFragment.java

Rework WidevineSamplePlayer to use fragments

2016-06-13 11:27:03 -07:00

VideoPlayerView.java

Rework WidevineSamplePlayer to use fragments

2016-06-13 11:27:03 -07:00

WidevineDrm.java

resolve merge conflicts of 907e26c to master

2016-06-17 15:36:23 -07:00

WidevineSamplePlayer.java

Rework WidevineSamplePlayer to use fragments

2016-06-13 11:27:03 -07:00