Gloria Wang 04b9169434 resolved conflicts for merge of a8d7b747 to master ... Change-Id: I8a4b72c9f9a10de8bbc285e00e2dd5cb9f498349		2010-11-03 11:39:04 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Add plumbing for volume mute key.	2010-11-02 17:31:39 -07:00
libs	Fix a key repeating bug.	2010-11-02 17:58:22 -07:00
opengl	Merge "OpenGL ES 1 YUV texturing test"	2010-10-28 15:44:11 -07:00
services/surfaceflinger	am 5c0efef9: am 7d452f69: Merge "really fix [3118445] Transform * Transform does not work as expected" into gingerbread	2010-10-27 23:48:26 -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	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	Add missing NOTICE entries.	2010-10-19 16:56:02 -07:00