Jean-Baptiste Queru 84199cac5d am 5fcfce96: am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise." ... * commit '5fcfce965f1380ee7e151c1df75b247dd42b349e': Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.		2011-04-26 01:20:37 -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 08d9d9a4: Merge "Runtime resource overlay, iteration 1."	2011-04-11 15:33:19 -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	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