Eric Laurent 342808f962 resolved conflicts for merge of d306cc81 to master ... Change-Id: Ib593b7719a837de12605e8c75904634843298ba1		2010-07-27 02:41:41 -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	am 1f2ec407: am 23e8de26: propagate sensor event rate properly	2010-07-21 18:13:39 -07:00
libs	am 1db0e88e: am 4782cdbb: Merge "Fix a memory corruption when writting Sensor into a parcel" into gingerbread	2010-07-22 20:11:54 -07:00
opengl	Update filltest.	2010-07-21 15:24:02 -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