Andreas Huber 87330d8ce3 Merge "Support http authentication ala http://foo:bar@host.org in stagefright."		2011-03-09 15:26:11 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am 7b13e27e: am 6167a390: Merge "ANativeWindow: add queues-to-window-composer check." into honeycomb-mr1	2011-03-09 15:03:04 -08:00
libs	Merge "ANativeWindow: add queues-to-window-composer check." into honeycomb-mr1	2011-03-09 14:47:56 -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