Irfan Sheriff 5c52057ae1 resolved conflicts for merge of d0514347 to master		2010-01-25 19:10:31 -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	Add an orientation parameter for overlay, so we can do camera preview in portrait mode.	2010-01-21 20:20:08 -08:00
cmds	keystore: compute the padding in an intuitive way.	2009-12-30 10:38:39 +08:00
common	Bug 2330111	2010-01-21 16:56:57 -08:00
include	Change key to KEY_SUPPORTED_JPEG_THUMBNAIL_SIZES for consistency.	2010-01-25 15:20:23 +08:00
libs	am 425324e9: am e834722f: Merge "Fix failure to open AVRCP input device due to EPERM." into eclair	2010-01-25 18:12:47 -08:00
opengl	fix [2341222] AGL version of glDrawTexxOES doesn't handle "Z" value correctly	2010-01-25 11:49:52 -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