Jean-Baptiste Queru dba0f1677e resolved conflicts for merge of 1ffd753e to gingerbread-plus-aosp ... Change-Id: I2741766c359bed3040fa3b787d72483eb028fb6d		2010-08-23 14:20:47 -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	Merge "Add OBB flags to support overlays" into gingerbread	2010-08-19 09:09:32 -07:00
libs	Merge "Free created FileMap when uncompressing files" into gingerbread	2010-08-20 13:16:20 -07:00
opengl	am bccfcd95: Merge "fix [2931718] glDrawArrays skips a triangle when more than 70 vertices are used." into gingerbread	2010-08-19 11:46:43 -07:00
services/surfaceflinger	am 545eab8a: Merge "remove unused pixel format" into gingerbread	2010-08-19 13:39:56 -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
NOTICE	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00