Jean-Baptiste Queru 1ccb98835a DO NOT MERGE resolved conflicts for merge of 8c11e952 to gingerbread-plus-aosp ... Change-Id: I29703133654f0f80a4425914d290e9dc50cbc3cc		2010-08-18 13:20:28 -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	resolved conflicts for merge of be50507b to gingerbread-plus-aosp	2010-08-17 09:01:26 -07:00
libs	resolved conflicts for merge of be50507b to gingerbread-plus-aosp	2010-08-17 09:01:26 -07:00
opengl	am 1e4aa48c: Merge "fix [2912927] Can\'t get NV_draw_path extension to work" into gingerbread	2010-08-13 14:27:36 -07:00
services/surfaceflinger	am 6a73368b: Merge "fix a typo that prevented glTexImage2D codepath to work" into gingerbread	2010-08-13 16:32:43 -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