Scott Main 3b51440fd0 am a810d02c: am dd7617b3: am 0722cec0: Merge "docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300" into honeycomb ... * commit 'a810d02ce075893fd0f81dbd2fd97089365efd68': docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300		2011-03-10 16:01:49 -08: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	Input improvements and bug fixes.	2011-03-09 18:30:28 -08:00
opengl	Merge "Added screenshot after glDraw* option to GLES2 Debugger"	2011-03-09 10:05:38 -08:00
services/surfaceflinger	ANativeWindow: add queues-to-window-composer check.	2011-03-08 16:49:51 -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