frameworks_av.git - frameworks/av

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge "Fix git_master-without-vendor build" into honeycomb	James Dong	2011-01-18	2	-7/+3
\|\
\| *	Fix git_master-without-vendor build	Dharmaray Kundargi	2011-01-18	2	-7/+3
\| \| \| \| \| \| \| \|	Change-Id: Ia1ceb9d2d11725950c1cdc3215661830842c51fb
* \|	videoeditor osal files check in on honeycomb	Dharmaray Kundargi	2011-01-17	1	-2/+17
\|/ \| \| \|	Change-Id: Ibb1f20329fbc6bb1629f5d6d4588eb6966f1c1ab
*	Merge "videoeditor osal files check in on honeycomb" into honeycomb	Dharmaray Kundargi	2011-01-17	51	-0/+18151
\|\
\| *	videoeditor osal files check in on honeycomb	Dharmaray Kundargi	2011-01-16	51	-0/+18151
\| \| \| \|	Change-Id: Id6c5f9f8819158ebffa9fd4dbbf5979a0e5f5808
*	Merge "videoeditor preview code on honeycomb" into honeycomb	Dharmaray Kundargi	2011-01-17	21	-0/+10572
\|\
\| *	videoeditor preview code on honeycomb	Dharmaray Kundargi	2011-01-16	21	-0/+10572
\| \| \| \|	Change-Id: I9c3c9cb921ea697ab16732973d26ef9035cda2ee
*	Removed unwanted line in M4READER_Amr.h	Dharmaray Kundargi	2011-01-17	132	-0/+88148
	vss core files upload on honeycomb Change-Id: I61206ae2398ce8ac544c6fb01a76fe8917bce75b