Jean-Baptiste Queru 2a73de7b21 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

..

audioflinger

Merge commit 'remotes/korg/cupcake' into merge

2009-03-18 11:33:14 -07:00

surfaceflinger

Merge commit 'remotes/korg/cupcake' into merge

2009-03-18 11:33:14 -07:00

ui

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

utils

Merge commit 'remotes/korg/cupcake' into merge

2009-03-18 11:33:14 -07:00