Robert Greenwalt 768c49d128 resolved conflicts for merge of 749e6bc5 to master ... Change-Id: Ica492307505d53e57863d4363b5f75abd798bcd8		2010-09-21 10:27:59 -07:00
cmds	added BinderService<> template to help creating native binder services	2010-07-14 18:43:19 -07:00
include	am bc9599d4: am 838e93ed: Merge "Looper: Drop default parameters in favor of a safer overload." into gingerbread	2010-09-17 16:10:01 -07:00
libs	am a8d95248: am 7d4739be: Merge "Reduce lock thrashing in native Looper." into gingerbread	2010-09-18 00:16:29 -07:00
opengl	am 5c746522: am 181e5ea8: Merge "support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl" into gingerbread	2010-09-20 19:32:01 -07:00
services/surfaceflinger	Merge "Fix a SurfaceFlinger bug."	2010-09-17 14:07:13 -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