android_frameworks_base

History

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

etc

auto import from //branches/cupcake/...@137197

2009-03-09 11:52:12 -07:00

res

auto import from //branches/cupcake_rel/...@138607

2009-03-13 13:04:22 -07:00

src/com/android/providers/settings

Merge commit 'remotes/korg/cupcake' into merge

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

Android.mk

auto import from //branches/cupcake/...@137197