Simon Wilson 41c48eef34 am 3f5995da: Merge "DO NOT MERGE Add images to ERI icon list" into gingerbread ... * commit '3f5995da76541443b7c071bd3acad7590ba222ec': DO NOT MERGE Add images to ERI icon list		2011-03-17 16:20:46 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am df6410dc: Merge "Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only" into gingerbread	2011-03-07 18:04:06 -08:00
libs	am 33029221: Merge "revert the surface purgatory list and dependent changes." into gingerbread	2011-03-09 17:11:10 -08:00
opengl	am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread	2011-02-23 12:46:57 -08:00
services/surfaceflinger	am 33029221: Merge "revert the surface purgatory list and dependent changes." into gingerbread	2011-03-09 17:11:10 -08: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