summaryrefslogtreecommitdiffstats
path: root/drm/libdrmframework/plugins/common
Commit message (Expand)AuthorAgeFilesLines
* Let getOriginalMimeType() take a fd passed from drm java applicationsJames Dong2012-08-102-4/+6
* am e20435de: Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libs build under ...James Dong2012-06-132-0/+190
|\
| * Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/James Dong2012-06-132-0/+190
* | Add a new API on DRM Framework for streamingKei Takahashi2012-05-232-0/+31
|/
* You don't need LOCAL_SHARED_LIBRARIES/LOCAL_STATIC_LIBRARIES to build a stati...Ying Wang2012-04-091-7/+0
* Removed unnecessary include JNI from two drm Android.mk filesJames Dong2012-03-281-1/+0
* AV Android make files changesJames Dong2012-03-281-3/+1
* Separate sniffing from session initializationJames Dong2012-01-122-6/+55
* Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-031-1/+1
* resolved conflicts for merge of 845fdba7 to masterGloria Wang2011-08-042-127/+173
|\
| * am 8a6fb50d: am 4e197ea8: am e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward...Gloria Wang2011-08-042-127/+173
| |\
| | * Bug fixes in OMA DRM v1 Forward Lock AgentHenrik B Andersson2011-08-042-127/+173
* | | Fix for bug 4371230.Gloria Wang2011-07-251-1/+7
* | | Bug fixes of DRM framework.Gloria Wang2011-03-151-1/+0
|/ /
* | am 1dac4cdd: am a220a297: Merge "Initial OMA DRM forward lock contribution"Gloria Wang2011-01-135-0/+423
|\ \ | |/
| * Initial OMA DRM forward lock contributionPravat Dalbehera2011-01-055-0/+423
* | am 24a90c26: am d9334934: Merge "Update of DRM Framework."Gloria Wang2010-11-222-0/+27
|\ \ | |/
| * Update of DRM Framework.Takeshi Aimi2010-11-192-0/+27
* | 64-bit file size/offset support for DRM frameworkGloria Wang2010-11-192-9/+9
|/
* Update of DRM frameworkTakeshi Aimi2010-11-022-0/+27
* Update of DRM framework.Takeshi Aimi2010-10-042-33/+71
* Initial contribution from Sony Corporation.aimitakeshi2010-09-012-0/+782