Jean-Baptiste Queru 8c33c55681 resolved conflicts for merge of 0b7bd95d to gingerbread-plus-aosp ... Change-Id: I55c1689c7d0737c943efec28d8164d6a5360621c		2010-08-17 15:24:11 -07:00
awt	Add correct copyright headers to multiple files	2010-03-11 18:22:10 -08:00
cmds	added BinderService<> template to help creating native binder services	2010-07-14 18:43:19 -07:00
include	resolved conflicts for merge of be50507b to gingerbread-plus-aosp	2010-08-17 09:01:26 -07:00
libs	resolved conflicts for merge of be50507b to gingerbread-plus-aosp	2010-08-17 09:01:26 -07:00
opengl	am 1e4aa48c: Merge "fix [2912927] Can\'t get NV_draw_path extension to work" into gingerbread	2010-08-13 14:27:36 -07:00
services/surfaceflinger	am 6a73368b: Merge "fix a typo that prevented glTexImage2D codepath to work" into gingerbread	2010-08-13 16:32:43 -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