Jean-Baptiste Queru 40858b24e7 resolved conflicts for merge of d26707da to master ... Change-Id: I1a379194f70c4b14191333ca2d8e6dd9d8b0f9dd		2010-01-12 11:53:42 -08:00
awt	Removed system/framework/android.awt.jar.	2009-07-02 14:11:33 -05:00
calendar	Generate a calendar static Java library.	2009-12-01 17:42:41 -08:00
camera	less log spew	2010-01-08 15:46:24 -05:00
cmds	keystore: compute the padding in an intuitive way.	2009-12-30 10:38:39 +08:00
common	Moved DomainNameChecker to android common.	2010-01-12 10:27:13 -08:00
include	Add string resource type inspection	2009-12-10 14:22:08 -08:00
libs	am 0c5cc224: am d20a55af: Merge change Iccfa50fe into eclair	2009-12-22 10:01:39 -08:00
opengl	Deprecate fill_parent and introduce match_parent.	2010-01-08 15:11:38 -08:00
vpn/java/android/net/vpn	Fix broken build.	2009-11-25 12:49:24 +08:00
cleanspec.mk	Rename [I]DropBox[Service] to [I]DropBoxManager[Service].	2009-11-12 13:58:27 -08:00
MODULE_LICENSE_APACHE2
NOTICE