Eric Laurent 72b44cf074 resolved conflicts for merge of 61bb25f2 to master		2010-02-11 10:38:28 -08:00
awt	Fix the broken compile of a currently-not-being-compiled AWT class.	2010-01-28 12:31:01 -08:00
calendar
camera	API Extension: Support for optionally specifying a map of extra request headers when specifying the uri of media data to be played.	2010-01-28 11:52:43 -08:00
cmds	keystore: compute the padding in an intuitive way.	2009-12-30 10:38:39 +08:00
common	Merge "Add back lost python script."	2010-02-10 14:52:07 -08:00
include	Add exposure compensation parameter.	2010-02-09 18:28:50 +08:00
libs	Merge "Remove some logs."	2010-02-10 00:07:36 -08:00
mms-common	Fix mms-common's pathnames to match package spec.	2010-02-02 15:32:55 -08:00
opengl	Merge "fix [2189862] Race condition in eglIntialize and eglDestroy"	2010-02-05 18:37:17 -08:00
vpn	Phase 2 of test cleanup: moving test files from AndroidTests closer to their sources.	2010-01-29 13:35:51 -08:00
cleanspec.mk
MODULE_LICENSE_APACHE2
NOTICE