Robert Greenwalt 3a0babc10b am 179dd46e: (-s ours) am 2e741556: (-s ours) am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread ... * commit '179dd46e5de9dd61a9011708d262ca40012e9040': DO NOT MERGE Backport of I1f55df8a from master.		2011-03-14 12:05:41 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am e6f0ae12: am efd3266b: Input improvements and bug fixes.	2011-03-09 18:39:46 -08:00
libs	Merge "SurfaceFlinger: Respect the PROTECTED gralloc bit." into honeycomb-mr1	2011-03-10 18:06:32 -08:00
opengl	GLES2Debugger: Added DbgContext and vertex data capturing.	2011-03-10 16:40:37 -08:00
services/surfaceflinger	Fix some const-ness and comments	2011-03-11 17:01:40 -08: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