Go to file
Jean-Baptiste Queru 732ca39b70 Merge commit 'remotes/korg/cupcake' into merge
Conflicts:
	core/java/android/view/animation/TranslateAnimation.java
	core/jni/Android.mk
	core/res/res/values-en-rGB/strings.xml
	libs/audioflinger/AudioFlinger.cpp
	libs/surfaceflinger/LayerScreenshot.cpp
	packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
2009-03-18 11:33:14 -07:00
awt auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
camera/libcameraservice Revert "Add support for camera preview to be in overlay surfaces." 2009-03-18 11:08:56 -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 Revert "Add support for camera preview to be in overlay surfaces." 2009-03-18 11:08:56 -07:00
libs Merge commit 'remotes/korg/cupcake' into merge 2009-03-18 11:33:14 -07:00
opengl auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08: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