Dianne Hackborn 461653aa73 am 6800a801: Merge "frameworks/base: Cap the number of toasts that a package can post." ... * commit '6800a80199477c90fc64af7211a177de06478a02': frameworks/base: Cap the number of toasts that a package can post.		2011-07-21 22:35:32 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am f458d5fd: Merge "Tweak for forward-compatibility"	2011-06-24 11:28:30 -07:00
libs	am 3cf03987: Merge "Continue idmap generation even if name lookup fails."	2011-07-21 13:09:05 -07:00
opengl	Merge from gingerbread	2011-03-29 13:54:43 -07:00
services/surfaceflinger	am afffa8fa: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)	2011-06-15 14:13:04 -07:00
vpn
MODULE_LICENSE_APACHE2
NOTICE	Fix omission in NOTICE file.	2011-01-18 15:25:32 -08:00