Dave Sparks 7118052e31 Merge commit '7b7225c8fdbead25235c74811b30ff4ee690dc58' into manual_merge ... Conflicts: camera/libcameraservice/CameraService.cpp		2009-05-21 10:17:23 -07:00
awt	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
camera/libcameraservice	Merge commit '7b7225c8fdbead25235c74811b30ff4ee690dc58' into manual_merge	2009-05-21 10:17:23 -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	bring the native_handle stuff back from master_gl	2009-05-20 14:33:23 -07:00
libs	bring the native_handle stuff back from master_gl	2009-05-20 14:33:23 -07:00
opengl	make sure to fail to software when the h/w renderer cannot be initialized	2009-05-20 17:58:36 -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