Android (Google) Code Review 0d7e7db880 am 5c2e622c: (-s ours) Merge change 6700 into donut ... Merge commit '5c2e622c9aa4f7e08374cfc54d11dab5a7474153' * commit '5c2e622c9aa4f7e08374cfc54d11dab5a7474153': do not merge - add a big flag to turn off backup		2009-07-09 16:38:44 -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	am 8a715b4b: Merge change 5510 into donut	2009-07-09 12:48:56 -07:00
libs	am be91fdbc: Merge change 6665 into donut	2009-07-09 14:12:52 -07:00
opengl	Make opengl loader use an absolute path.	2009-07-07 16:18:18 -07:00
vpn/java/android/net/vpn	Add PPTP, L2TP/IPSec preshared key and other fixes.	2009-06-26 03:02: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