jsh d515c152b5 resolved conflicts for merge of 8e0fb366 to master		2009-07-15 18:42:47 -07:00
awt	Removed system/framework/android.awt.jar.	2009-07-02 14:11:33 -05:00
camera/libcameraservice	resolved conflicts for merge of 04c7d0f8 to master	2009-07-08 17:26:05 -07:00
cmds	am 3383df38: Merge change 6198 into donut	2009-07-06 11:22:25 -07:00
im/java/android/im	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
include	Merge change 7353	2009-07-15 09:05:23 -07:00
libs	Merge change 7419	2009-07-15 13:58:02 -07:00
opengl	this header file is not needed anymore	2009-07-14 14:50:44 -07:00
vpn/java/android/net/vpn	Make VPN connect even when DNS is not present and other fixes.	2009-07-14 16:29:22 +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