Scott Main 229042cb48 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 'dd7617b3276c0a666c17ae2fb3ab02d5dce4b354': 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 15:57:34 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Input improvements and bug fixes.	2011-03-09 18:30:28 -08:00
libs	Input improvements and bug fixes.	2011-03-09 18:30:28 -08:00
opengl	am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread	2011-02-23 12:46:57 -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
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00