Jean-Baptiste Queru 8ff8a2d029 resolved conflicts for merge of 8fc378f9 to gingerbread-plus-aosp ... Change-Id: I938c0a66ad4271b33626d6b12406a2f6c6d1b6d8		2010-11-17 16:47:59 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Drop all dispatcher state when dispatcher is disabled.	2010-10-27 18:43:51 -07:00
libs	Merge "fix [3148312] Region can access data out of bounds" into gingerbread	2010-11-08 13:40:40 -08:00
opengl	am 17fd21fc: Merge "DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions" into gingerbread	2010-11-10 14:15:57 -08:00
services/surfaceflinger	am 7d452f69: Merge "really fix [3118445] Transform * Transform does not work as expected" into gingerbread	2010-10-27 23:46:25 -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	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00