Fred Quintana d945ef0d3c resolved conflicts for merge of b8675943 to master		2009-11-24 11:39:32 -08:00
awt	Removed system/framework/android.awt.jar.	2009-07-02 14:11:33 -05:00
camera/libcameraservice	Fix potential deadlock in stopPreview/stopRecord.	2009-11-10 17:08:08 -08:00
cmds	keystore: remove old implementation and test.	2009-09-24 13:35:26 +08:00
common	Add OperationScheduler (and test) to the common static library;	2009-11-21 10:09:46 -08:00
include	fix some aspects of [2258746] native crash in launcher2	2009-11-13 15:26:29 -08:00
libs	Merge change I49f02be9 into eclair	2009-11-21 00:18:24 -08:00
opengl	am 8e9af2bd: am b439f561: am 13feccf5: Merge change I39f0003e into eclair	2009-11-19 19:16:58 -08:00
vpn/java/android/net/vpn	Remove deprecated VpnType.getDescription().	2009-09-30 18:39:48 +08:00
cleanspec.mk	Rename [I]DropBox[Service] to [I]DropBoxManager[Service].	2009-11-12 13:58:27 -08:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	Start using CLDR for some date-and-time strings and formats.	2009-05-15 10:15:50 -07:00