johnwang ecc0defdd8 resolved conflicts for merge of 696b912e to eclair ... modified: telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java modified: telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java modified: telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java modified: telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java		2009-08-17 19:20:07 -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
im/java/android/im	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
include	Support for marshalling pointers / intptr_t in Parcel.	2009-08-17 15:31:25 -07:00
libs	Support for marshalling pointers / intptr_t in Parcel.	2009-08-17 15:31:25 -07:00
opengl	Better error handling in EGL extensions	2009-08-12 21:18:15 -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