Conley Owens ea98367cd4 Merge "Added null check on return value for getKeyDispatcherState()"		2011-04-28 15:07:00 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am 08d9d9a4: Merge "Runtime resource overlay, iteration 1."	2011-04-11 15:33:19 -07:00
libs	am 13ce221e: Merge "libutils: Fix an improper const-cast in RefBase"	2011-04-26 11:32:22 -07:00
opengl	am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread	2011-02-23 12:46:57 -08:00
services/surfaceflinger	am 86d1d747: Merge "Add lock before calling initEglImage"	2011-04-27 12:43:19 -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	Fix omission in NOTICE file.	2011-01-18 15:25:32 -08:00