Mathias Agopian 0308739d0b Merge commit 'goog/master' into master_gl ... Conflicts: libs/utils/Parcel.cpp		2009-04-10 14:36:33 -07:00
awt	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
camera/libcameraservice	AI 143327: am: CL 143177 am: CL 142889 Fix issue #1736153 Camera shutter sound can be muted by new AlarmClock setting.	2009-03-27 18:18:46 -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	Integrate from //sandbox/mathias/donut/...@145728	2009-04-10 14:24:30 -07:00
libs	Merge commit 'goog/master' into master_gl	2009-04-10 14:36:33 -07:00
opengl	Integrate from //sandbox/mathias/donut/...@145728	2009-04-10 14:24:30 -07:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00