Jean-Baptiste Queru 62cd9aa77c resolved conflicts for merge of ff749b9a to master ... Change-Id: Ieb368754b84a47179b75cbae8fcd7d971893b7af		2010-08-30 14:00:27 -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	am d322d163: am ae66946b: Merge "fix a race in SF buffer management" into gingerbread	2010-08-27 16:18:12 -07:00
libs	am 8e724905: am ad6731b0: Merge "Add debugging to ZipFileRO" into gingerbread	2010-08-27 16:18:44 -07:00
opengl	Add KHR_gl_texture_2D_image extension string.	2010-08-27 16:08:03 -07:00
services/surfaceflinger	am 6d4346ce: am 4cffbb47: Merge "fix [2946787] Screen flicker on low resolution setting in camcorder." into gingerbread	2010-08-25 16:40:28 -07:00
vpn	Phase 2 of test cleanup: moving test files from AndroidTests closer to their sources.	2010-01-29 13:35:51 -08: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