Dianne Hackborn 4743a87526 resolved conflicts for merge of f0d83fd9 to master		2009-07-28 15:23:21 -07:00
awt	Removed system/framework/android.awt.jar.	2009-07-02 14:11:33 -05:00
camera/libcameraservice	Fix issue 1795088 Improve audio routing code	2009-07-23 06:03:39 -07:00
cmds	am 75b68163: Add memcpy and strcpy boundary check.	2009-07-24 12:52:33 -07:00
im/java/android/im	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
include	Fix issue 1795088 Improve audio routing code	2009-07-23 06:03:39 -07:00
libs	resolved conflicts for merge of ac38dfc5 to master	2009-07-28 14:20:21 -07:00
opengl	Merge commit 'goog/readonly-korg-master' into merge_korg_master	2009-07-16 14:54:11 -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