Brad Fitzpatrick 8d7f08b538 resolved conflicts for merge of 171c83f4 to master ... Change-Id: I56a4c1838b17cf40d96763f95df3c84fc86359eb		2010-09-12 13:55:18 -07:00
cmds	added BinderService<> template to help creating native binder services	2010-07-14 18:43:19 -07:00
include	Merge "Purge Skia objects from GL caches as needed."	2010-09-08 18:06:11 -07:00
libs	am 510951e9: am a8512a71: Always set the scheduling group when starting a new thread.	2010-09-09 23:11:22 -07:00
opengl	Add support for KHR_fence_sync	2010-09-10 14:01:45 -07:00
services/surfaceflinger	surfaceflinger: give hwcomposer a chance to release buffers	2010-09-09 12:06:48 -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