Eric Fischer c125aad08d resolved conflicts w/ 5bd644caf73e76750feef1a82b8817d32f5367fc merge....		2009-05-15 11:38:38 -07:00
awt	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
camera/libcameraservice	Modify camera framework to use new streamlined binder interface.	2009-05-11 07:36:58 -07:00
cmds	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
im/java/android/im	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
include	Implement the C++ class to write the backed up file data.	2009-05-15 10:37:10 -04:00
libs	am 4535e405: Implement the C++ class to write the backed up file data.	2009-05-15 07:55:51 -07:00
opengl	should help fix the Simulator build.	2009-05-13 00:19:22 -07: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