Conley Owens 61b1dd24a9 Merge changes I0ab47e2f,Ib8016996 ... * changes: Remove errant tag terminator Normalize output of XMLtree content		2011-04-27 13:06:46 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Runtime resource overlay, iteration 1.	2011-04-01 14:12:10 +02:00
libs	libutils: Fix an improper const-cast in RefBase	2011-04-22 11:13:35 -07:00
opengl	Merge from gingerbread	2011-03-29 13:54:43 -07:00
services/surfaceflinger	Add lock before calling initEglImage	2011-04-15 10:38:33 -07: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