Jim Miller 3079384361 am 98747715: Merge change I88614e93 into eclair ... Merge commit '987477159fb003aaf70c7e3ef17c0830fa8fe39c' into eclair-plus-aosp * commit '987477159fb003aaf70c7e3ef17c0830fa8fe39c': Fix for 2137900: Be more conservative about poking the wakelock.		2009-09-29 15:51:38 -07:00
awt	Removed system/framework/android.awt.jar.	2009-07-02 14:11:33 -05:00
camera/libcameraservice	Fix 2083478: Camera needs an auto-focus cancel API	2009-09-15 18:29:03 +08:00
cmds	keystore: remove old implementation and test.	2009-09-24 13:35:26 +08:00
include	Change FLASH_MODE_VIDEO_LIGHT to FLASH_MODE_TORCH.	2009-09-28 13:51:59 -07:00
libs	Change FLASH_MODE_VIDEO_LIGHT to FLASH_MODE_TORCH.	2009-09-28 13:51:59 -07:00
opengl	Don't ask for pbuffer support, because we don't use any pbuffers.	2009-09-28 18:28:07 -07:00
vpn/java/android/net/vpn	Simplifies err code propagation.	2009-08-28 09:59:39 +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