Brad Fitzpatrick 6eba882d83 resolved conflicts for merge of 64591009 to gingerbread-plus-aosp ... Change-Id: Id9ebca9993f97a79cb2a6c41a7566d473ccc5b7e		2010-09-07 21:41:09 -07:00
cmds	added BinderService<> template to help creating native binder services	2010-07-14 18:43:19 -07:00
include	Modify native ALooper to take an explicit ident.	2010-09-07 15:46:55 -07:00
libs	Revert "Free created FileMap when uncompressing files"	2010-09-07 19:30:22 -07:00
opengl	am ff3dcf27: Merge "cleanup EGL a bit. remove unused extension." into gingerbread	2010-08-27 14:17:00 -07:00
services/surfaceflinger	am 4cffbb47: Merge "fix [2946787] Screen flicker on low resolution setting in camcorder." into gingerbread	2010-08-25 15:40:44 -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
NOTICE	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00