Hung-ying Tyan 1014f60186 resolved conflicts for merge of 2a36a778 to master ... Change-Id: Ia70adeef06afddd29c827405fb5657bf9f5a29a3		2010-09-28 12:17:44 +08:00
cmds	added BinderService<> template to help creating native binder services	2010-07-14 18:43:19 -07:00
include	Add support for transferring touch focus.	2010-09-27 16:10:17 -07:00
libs	Add support for transferring touch focus.	2010-09-27 16:10:17 -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	am 495ad4f2: am beabe75a: Merge changes I1f7c4535,I741c68a2 into gingerbread	2010-09-24 18:13:22 -07:00
vpn
MODULE_LICENSE_APACHE2
NOTICE	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00