Jean-Baptiste Queru ad0f5cc955 resolved conflicts for merge of c64b916e to master ... Change-Id: I31b84d72186a918f19e0c9dee8fdebc83f661cc1		2010-08-24 10:45:16 -07:00
awt	Add correct copyright headers to multiple files	2010-03-11 18:22:10 -08:00
cmds	added BinderService<> template to help creating native binder services	2010-07-14 18:43:19 -07:00
include	Change the framework to use the new camera preview path.	2010-08-23 14:31:30 -07:00
libs	am b90b9d54: am 6be23712: Merge "Free created FileMap when uncompressing files" into gingerbread	2010-08-24 09:02:28 -07:00
opengl	am b3aaf3ba: am bccfcd95: Merge "fix [2931718] glDrawArrays skips a triangle when more than 70 vertices are used." into gingerbread	2010-08-21 09:42:53 -07:00
services/surfaceflinger	Change the framework to use the new camera preview path.	2010-08-23 14:31:30 -07:00
vpn	DO NOT MERGE	2010-03-29 18:12:24 -07:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00