Hung-ying Tyan 92b74798a8 resolved conflicts for merge of ee813bae to master ... Change-Id: I84ca961fb18b29313b5ec6041a79ca87a1a1cd68		2010-09-24 13:45:43 +08: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 4eb1ad5e: am 524a6d8e: Merge "better fix for [3028370] GL get error should return a valid error if no context is bound." into gingerbread	2010-09-23 21:41:30 -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