Andreas Huber cf0cd24af5 am 2e1a8967: (-s ours) resolved conflicts for merge of 31dc911a to gingerbread-plus-aosp ... * commit '2e1a8967243a88d73f3b3485b07a02aa4f8d16d9': Support post-decode video rotation.		2010-11-08 13:14:17 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	The CHEEK_TOUCH stuff never worked. Remove it.	2010-11-08 13:02:58 -08:00
libs	The CHEEK_TOUCH stuff never worked. Remove it.	2010-11-08 13:02:58 -08: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