Simon Wilson b7434bbf93 am 3d79f1ce: am edc68a00: Merge "Attempt to reduce problems from issue #3183612" into gingerbread ... * commit '3d79f1ce84ee60dbb26468b9e5f75f4ccb5ed8aa': Attempt to reduce problems from issue #3183612		2011-03-02 18:13:49 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am 93552de8: Merge "stubs"	2011-02-11 09:54:59 -08:00
libs	am c2efcd2c: Merge "Initialize the SurfaceTexture transform fields." into honeycomb	2011-02-04 15:05:28 -08:00
opengl	am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread	2011-02-23 12:46:57 -08:00
services/surfaceflinger	am e630e5f4: am 919853ce: Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbread	2011-02-27 15:55:21 -08:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of 00118a48 to honeycomb-merge	2011-01-27 18:25:32 -08:00