Mike LeBeau 41c8ca73ff merged 98acd54, resolved conflicts		2009-05-08 17:59:05 -07:00
awt	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
camera/libcameraservice	Remove debug messages.	2009-04-22 16:22:01 +08: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	am 3fd7e13: Merge branch \'donut\' of ssh://android-git.corp.google.com:29	2009-05-08 07:22:45 -07:00
libs	am 3fd7e13: Merge branch \'donut\' of ssh://android-git.corp.google.com:29	2009-05-08 07:22:45 -07:00
opengl	Require native-order direct buffers for glXXXPointer APIs.	2009-05-07 18:28:29 -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