Dan Egnor a53040a705 resolved conflicts for merge of 9bc4039a to gingerbread ... Change-Id: I6f9262fb293a67cbc04e5756205ae56e28c299ec		2010-07-20 11:30:17 -07:00
awt
cmds	added BinderService<> template to help creating native binder services	2010-07-14 18:43:19 -07:00
include	Merge "Re-use existing Surface objects when reading them from parcels." into gingerbread	2010-07-16 15:14:44 -07:00
libs	Remove some debug logging that I accidentally committed.	2010-07-19 16:09:26 -07:00
opengl	Merge "Fix a bug that prevented the creation of EGL shared contexts." into gingerbread	2010-07-02 12:32:33 -07:00
services/surfaceflinger	added BinderService<> template to help creating native binder services	2010-07-14 18:43:19 -07:00
vpn	DO NOT MERGE	2010-03-29 18:12:24 -07:00
MODULE_LICENSE_APACHE2
NOTICE	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00