Jean-Baptiste Queru ef3270ad69 resolved conflicts for merge of c2894474 to gingerbread-plus-aosp ... Change-Id: Ie00785e37809b677d6e8ab44c47e1f26037793d2		2010-10-10 17:45:45 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Added more robust tracking and cancelation of events.	2010-10-10 14:45:51 -07:00
libs	Added more robust tracking and cancelation of events.	2010-10-10 14:45:51 -07:00
opengl	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 18:17:08 -07:00
services/surfaceflinger	am 19058877: Merge "refactored screenshot code" into gingerbread	2010-10-04 20:06:51 -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