Mathias Agopian c479e18db0 resolved conflicts for merge of 48a86240 to master ... Change-Id: I2305fef9f4dd46183337217d822df3c675b6b6e5		2010-09-15 12:29:18 -07: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 48a86240 to master	2010-09-15 12:29:18 -07:00
libs	resolved conflicts for merge of 48a86240 to master	2010-09-15 12:29:18 -07:00
opengl	Add support for KHR_fence_sync	2010-09-10 14:01:45 -07:00
services/surfaceflinger	resolved conflicts for merge of 48a86240 to master	2010-09-15 12:29:18 -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