Dianne Hackborn a5522f4804 resolved conflicts for merge of 301b97ac to eclair ... Change-Id: I0fb70cbe0a52006ad14f43a02c30b72aad457c48		2009-08-27 12:26:44 -07:00
awt	Removed system/framework/android.awt.jar.	2009-07-02 14:11:33 -05:00
camera/libcameraservice	Modified the camera HAL interface to use the same generic callback architecture as camera services	2009-08-13 10:46:28 -07:00
cmds	Fix network order for marshalling in keystore interface.	2009-08-10 16:13:00 +08:00
include	Calculate specular lighting correctly	2009-08-25 18:35:54 -07:00
libs	dumpsys SurfaceFlinger will now always dump SF's state, even if SF is deadlocked	2009-08-26 16:55:50 -07:00
opengl	Calculate specular lighting correctly	2009-08-25 18:35:54 -07:00
vpn/java/android/net/vpn	Issue an error when VPN connection is lost.	2009-08-03 16:22:24 +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