Jeff Brown 1a15c6eaff resolved conflicts for merge of aca672ba to master ... Change-Id: I7ae11fca0acdbf513a4870226d0d3e3cafbe9a08		2010-07-15 23:47:29 -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 aca672ba to master	2010-07-15 23:47:29 -07:00
libs	resolved conflicts for merge of aca672ba to master	2010-07-15 23:47:29 -07:00
opengl	gl perf test cleanup.	2010-07-12 11:59:34 -07:00
services/surfaceflinger	added BinderService<> template to help creating native binder services	2010-07-14 18:43:19 -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