frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	resolved conflicts for merge of a8d7b747 to master	Gloria Wang	2010-11-03	10	-91/+108
\|\
\| *	Update of DRM framework	Takeshi Aimi	2010-11-02	10	-91/+108
* \|	Add support for WV plugin	Gloria Wang	2010-10-29	1	-0/+27
\|/
*	Update of DRM framework.	Takeshi Aimi	2010-10-04	11	-176/+253
*	Make DRM libraries optional	Jean-Baptiste Queru	2010-09-10	2	-2/+3
*	fix build	Jean-Baptiste Queru	2010-09-09	1	-2/+7
*	fix build	Jean-Baptiste Queru	2010-09-09	1	-2/+7
*	Initial contribution from Sony Corporation.	aimitakeshi	2010-09-01	19	-0/+3287