frameworks_av.git - frameworks/av

	Commit message (Expand)	Author	Age	Files	Lines
*	resolved conflicts for merge of 845fdba7 to master	Gloria Wang	2011-08-04	1	-0/+3
\|\
\| *	am 8a6fb50d: am 4e197ea8: am e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward...	Gloria Wang	2011-08-04	1	-0/+3
\| \|\
\| \| *	Bug fixes in OMA DRM v1 Forward Lock Agent	Henrik B Andersson	2011-08-04	1	-0/+3
* \| \|	frameworks/base: remove LOCAL_PRELINK_MODULE	Iliyan Malchev	2011-03-14	1	-1/+1
\|/ /
* \|	rename /system/lib/drm/plugins/native/ to /system/lib/drm-plugin/	Gloria Wang	2011-01-18	1	-1/+1
\|/
*	Initial OMA DRM forward lock contribution	Pravat Dalbehera	2011-01-05	1	-0/+67