Kenny Root b5e7f05190 am 13ce221e: Merge "libutils: Fix an improper const-cast in RefBase" ... * commit '13ce221e4316f7956ba072e774a7b97646e5d99b': libutils: Fix an improper const-cast in RefBase		2011-04-26 11:32:22 -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 33029221: Merge "revert the surface purgatory list and dependent changes." into gingerbread	2011-03-09 17:11:10 -08:00
vpn
MODULE_LICENSE_APACHE2
NOTICE	Fix omission in NOTICE file.	2011-01-18 15:25:32 -08:00