Nick Pelly 130f48f5bc Merge branch gingerbread-nfc into gingerbread. ... Change-Id: I37d657a16061fddfbb0993463f24d6d3945cddd1 Signed-off-by: Nick Pelly <npelly@google.com>		2010-12-05 14:45:29 -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	Fix a key repeating bug. (DO NOT MERGE)	2010-11-17 19:42:04 -08:00
opengl	Merge "DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions" into gingerbread	2010-11-10 14:09:17 -08:00
services/surfaceflinger	really fix [3118445] Transform * Transform does not work as expected	2010-10-27 18:04:11 -07:00
vpn
MODULE_LICENSE_APACHE2
NOTICE	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00