Dianne Hackborn 8f6bab0b8f resolved conflicts for merge of 8952a448 to master ... Change-Id: I9c752a5d10ae8d8e5ead1243b6abd4795204fc0b		2010-09-23 20:33:19 -07:00
cmds	added BinderService<> template to help creating native binder services	2010-07-14 18:43:19 -07:00
include	am 4ec134cd: am cce0cd13: Merge "Looper: use pthread_once for TLS key initialization." into gingerbread	2010-09-21 15:57:13 -07:00
libs	am 4ec134cd: am cce0cd13: Merge "Looper: use pthread_once for TLS key initialization." into gingerbread	2010-09-21 15:57:13 -07:00
opengl	am 9c4d7d67: am 5c6c5c7a: fix [3028370] GL get error should return a valid error if no context is bound.	2010-09-23 13:28:47 -07:00
services/surfaceflinger	dump HWC state in dumpsys	2010-09-23 18:13:21 -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