Gloria Wang 45f3121a6a Merge "Fix for 4084554. DRM framework support for enabling/disabling copy control settings from a DRM plugin"		2011-03-21 15:01:00 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Merge "Refactor how timeouts are calculated."	2011-03-17 20:16:42 -07:00
libs	Merge "Refactor how timeouts are calculated."	2011-03-17 20:16:42 -07:00
opengl	Merge "GLES2Debugger: Make command exchange async to improve performance."	2011-03-17 14:38:37 -07:00
services/surfaceflinger	am bd340c7b: am b368f4d8: am 38caff23: Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1	2011-03-18 17:38:37 -07:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +08:00
GenerationCache.h	Add TextLayout Cache	2011-03-02 13:29:20 -08:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00