Jeff Brown 4c766ccea5 resolved conflicts for merge of df3cccf3 to master ... Change-Id: I425496a9fc4e9cbc50ad6938e9dccb14827d9558		2010-10-27 22:18:43 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	resolved conflicts for merge of df3cccf3 to master	2010-10-27 22:18:43 -07:00
libs	resolved conflicts for merge of df3cccf3 to master	2010-10-27 22:18:43 -07:00
opengl	Trace glUniformXXv and glUniformMatrixXfv calls.	2010-10-27 15:37:01 -07:00
services/surfaceflinger	am e1ca532d: am 457bed2b: Merge "fix [3123221] Video sticks playing back upside down following orientation switch" into gingerbread	2010-10-25 13:53: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	Add missing NOTICE entries.	2010-10-19 16:56:02 -07:00