Steve Block 48429f69d3 Merge "Hook up CookieManager.acceptCookie() and setAcceptCookie() for the Chromium HTTP stack"		2010-10-27 11:47:45 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am 2ef36763: am 860c2df4: Merge "Add unit tests for native input and fix bugs identified." into gingerbread	2010-10-24 14:36:23 -07:00
libs	Merge "convert one of the LOGE to LOG_WINDOW msg to reduce grief"	2010-10-26 18:39:27 -07:00
opengl	Merge "OpenGL tracing."	2010-10-26 18:37:10 -07:00
services/surfaceflinger	am e1ca532d: am 457bed2b: Merge "fix [3123221] Video sticks playing back upside down following orientation switch" into gingerbread	2010-10-25 13:53:33 -07:00
vpn	Phase 2 of test cleanup: moving test files from AndroidTests closer to their sources.	2010-01-29 13:35:51 -08:00
MODULE_LICENSE_APACHE2
NOTICE	Add missing NOTICE entries.	2010-10-19 16:56:02 -07:00