Jean-Baptiste Queru a0410b4b68 resolved conflicts for merge of b237bdb6 to gingerbread-plus-aosp ... Change-Id: Ibd9f488a0331c472a852054af5db06f8e7d35e76		2010-07-26 10:22:58 -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	propagate sensor event rate properly	2010-07-21 16:09:39 -07:00
libs	Fix a memory corruption when writting Sensor into a parcel	2010-07-22 18:57:41 -07:00
opengl	am 8ecfb60a: Merge "Fix a bug that prevented the creation of EGL shared contexts." into gingerbread	2010-07-02 12:34:22 -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	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